@modos189/nativescript-webview-x 1.0.2 → 1.0.3

package/README.md

@@ -55,12 +55,15 @@ _None._
 | `userAgent` | `string` | Set a custom User-Agent string |
 | `debugMode` | `boolean` | Enable remote WebView debugging |
 | `supportPopups` | `boolean` | Open `window.open()` / `target="_blank"` links in a native popup. Default: `true` |
+| `autoInjectJSBridge` | `boolean` | Inject `window.nsWebViewBridge` on every `loadFinished`. Default: `true` |
 
 ### Methods
 
 | Method | Returns | Description |
 | --- | --- | --- |
 | `getTitle()` | `Promise<string | undefined>` | Return the current page title |
+| `executeJavaScript(code: string)` | `Promise<any>` | Execute JavaScript in the page context and return the JSON-serialised result |
+| `emitToWebView(eventName: string, data: any)` | `void` | Emit an event into the page's `nsWebViewBridge` (calls `onNativeEvent` inside the WebView) |
 
 ### Events
 

package/index.android.d.ts

@@ -3,7 +3,10 @@ import { AWebView } from '@nativescript-community/ui-webview/index.android';
 export declare class WebViewX extends AWebView {
     static get popupNavigateEvent(): string;
     private _popupClient;
+    private _localResourceClient;
     _onPopupNavigate(url: string): boolean;
     initNativeView(): void;
     disposeNativeView(): void;
+    registerLocalResource(resourceName: string, path: string): void;
+    unregisterLocalResource(resourceName: string): void;
 }

package/index.android.js

@@ -5,6 +5,7 @@ export class WebViewX extends AWebView {
     constructor() {
         super(...arguments);
         this._popupClient = null;
+        this._localResourceClient = null;
     }
     static get popupNavigateEvent() {
         return POPUP_NAVIGATE_EVENT;
@@ -24,6 +25,11 @@ export class WebViewX extends AWebView {
         if (!nv)
             return;
         const wv = nv;
+        // shouldInterceptRequest is called on Chromium's network thread; NativeScript cannot
+        // safely dispatch to V8 from there — wrap the NS client so it runs entirely in Java.
+        const nsClient = wv.getWebViewClient();
+        this._localResourceClient = new com.modos189.webviewx.LocalResourceWebViewClient(nsClient);
+        wv.setWebViewClient(this._localResourceClient);
         const existing = wv.getWebChromeClient();
         this._popupClient = new com.modos189.webviewx.PopupWebChromeClient(existing, true, this._context);
         const interceptor = new com.modos189.webviewx.PopupWebChromeClient.PopupUrlInterceptor({
@@ -38,9 +44,26 @@ export class WebViewX extends AWebView {
         settings.setSupportMultipleWindows(true);
     }
     disposeNativeView() {
+        this._localResourceClient = null;
         this._popupClient = null;
         super.disposeNativeView();
     }
+    registerLocalResource(resourceName, path) {
+        super.registerLocalResource(resourceName, path);
+        if (this._localResourceClient) {
+            const filepath = this.resolveLocalResourceFilePath(path);
+            if (filepath) {
+                const fixedName = this.fixLocalResourceName(resourceName);
+                this._localResourceClient.registerResource(fixedName, filepath);
+            }
+        }
+    }
+    unregisterLocalResource(resourceName) {
+        super.unregisterLocalResource(resourceName);
+        if (this._localResourceClient) {
+            this._localResourceClient.unregisterResource(this.fixLocalResourceName(resourceName));
+        }
+    }
     [supportPopupsProperty.setNative](value) {
         const nv = this.nativeViewProtected;
         if (!nv)

package/index.android.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../packages/webview-x/index.android.ts"],"names":[],"mappings":"AAAA,cAAc,kDAAkD,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AAEnG,MAAM,oBAAoB,GAAG,eAAe,CAAC;AAE7C,MAAM,OAAO,QAAS,SAAQ,QAAQ;IAAtC;;QAKU,iBAAY,GAAsD,IAAI,CAAC;IAgDjF,CAAC;IApDC,MAAM,KAAK,kBAAkB;QAC3B,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAID,gBAAgB,CAAC,GAAW;QAC1B,MAAM,IAAI,GAAQ;YAChB,SAAS,EAAE,oBAAoB;YAC/B,GAAG;YACH,MAAM,EAAE,KAAK;SACd,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC;IAC9B,CAAC;IAED,cAAc;QACZ,KAAK,CAAC,cAAc,EAAE,CAAC;QAEvB,MAAM,EAAE,GAAG,IAAI,CAAC,mBAAmB,CAAC;QACpC,IAAI,CAAC,EAAE;YAAE,OAAO;QAEhB,MAAM,EAAE,GAAG,EAAuC,CAAC;QAEnD,MAAM,QAAQ,GAAG,EAAE,CAAC,kBAAkB,EAAE,CAAC;QACzC,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClG,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,CAAC,mBAAmB,CAAC;YACrF,sBAAsB,EAAE,CAAC,GAAW,EAAE,EAAE;gBACtC,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC5D,CAAC;SACF,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACjD,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEzC,MAAM,QAAQ,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC;QAClC,QAAQ,CAAC,wCAAwC,CAAC,IAAI,CAAC,CAAC;QACxD,QAAQ,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,iBAAiB;QACf,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,KAAK,CAAC,iBAAiB,EAAE,CAAC;IAC5B,CAAC;IAED,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,KAAc;QAC9C,MAAM,EAAE,GAAG,IAAI,CAAC,mBAAmB,CAAC;QACpC,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,MAAM,QAAQ,GAAI,EAAwC,CAAC,WAAW,EAAE,CAAC;QACzE,QAAQ,CAAC,wCAAwC,CAAC,KAAK,CAAC,CAAC;QACzD,QAAQ,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,YAAY,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;CACF"}
+{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../packages/webview-x/index.android.ts"],"names":[],"mappings":"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"}

package/index.d.ts

@@ -2,10 +2,7 @@ export * from '@nativescript-community/ui-webview';
 import { AWebView } from '@nativescript-community/ui-webview';
 
 export declare class WebViewX extends AWebView {
-  /**
-   * Set once before any instance is created; applied automatically during native view init before the first URL loads.
-   * Receives the platform default UA (string on Android WebView, null on iOS/GeckoView where it is unavailable synchronously).
-   * Return the desired UA string, or null to leave the platform default unchanged.
-   */
   static readonly popupNavigateEvent: string;
+  registerLocalResource(resourceName: string, path: string): void;
+  unregisterLocalResource(resourceName: string): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modos189/nativescript-webview-x",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Add a plugin description",
   "main": "index",
   "types": "index.d.ts",

package/platforms/android/java/com/modos189/webviewx/LocalResourceWebViewClient.java

@@ -0,0 +1,168 @@
+package com.modos189.webviewx;
+
+import android.graphics.Bitmap;
+import android.webkit.WebResourceError;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebResourceResponse;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+import java.io.FileInputStream;
+import java.io.File;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Wraps the NativeScript WebViewClient to handle shouldInterceptRequest entirely in Java.
+ *
+ * Android calls shouldInterceptRequest on Chromium's network thread; NativeScript cannot
+ * safely dispatch JS callbacks from non-UI threads, causing fatal crashes
+ * ("Cannot find runtime/object id for instance=...WebViewClient...").
+ * All other callbacks run on the UI thread and are delegated to the original client unchanged.
+ */
+public class LocalResourceWebViewClient extends WebViewClient {
+
+    private static final String INTERCEPT_SCHEME = "x-local";
+
+    private static final Map<String, String> EXT_TO_MIME = new HashMap<>();
+    static {
+        EXT_TO_MIME.put("js",    "application/javascript");
+        EXT_TO_MIME.put("mjs",   "application/javascript");
+        EXT_TO_MIME.put("css",   "text/css");
+        EXT_TO_MIME.put("html",  "text/html");
+        EXT_TO_MIME.put("htm",   "text/html");
+        EXT_TO_MIME.put("json",  "application/json");
+        EXT_TO_MIME.put("xml",   "text/xml");
+        EXT_TO_MIME.put("txt",   "text/plain");
+        EXT_TO_MIME.put("png",   "image/png");
+        EXT_TO_MIME.put("jpg",   "image/jpeg");
+        EXT_TO_MIME.put("jpeg",  "image/jpeg");
+        EXT_TO_MIME.put("gif",   "image/gif");
+        EXT_TO_MIME.put("webp",  "image/webp");
+        EXT_TO_MIME.put("svg",   "image/svg+xml");
+        EXT_TO_MIME.put("ico",   "image/x-icon");
+        EXT_TO_MIME.put("woff",  "font/woff");
+        EXT_TO_MIME.put("woff2", "font/woff2");
+        EXT_TO_MIME.put("ttf",   "font/ttf");
+        EXT_TO_MIME.put("otf",   "font/otf");
+        EXT_TO_MIME.put("mp4",   "video/mp4");
+        EXT_TO_MIME.put("webm",  "video/webm");
+    }
+
+    private static final Set<String> TEXT_MIME_PREFIXES = new HashSet<>();
+    static {
+        TEXT_MIME_PREFIXES.add("text/");
+        TEXT_MIME_PREFIXES.add("application/javascript");
+        TEXT_MIME_PREFIXES.add("application/json");
+        TEXT_MIME_PREFIXES.add("image/svg+xml");
+    }
+
+    private final WebViewClient delegate;
+    private final ConcurrentHashMap<String, String> resourceMap = new ConcurrentHashMap<>();
+
+    public LocalResourceWebViewClient(WebViewClient delegate) {
+        this.delegate = delegate;
+    }
+
+    public void registerResource(String name, String filePath) {
+        resourceMap.put(name, filePath);
+    }
+
+    public void unregisterResource(String name) {
+        resourceMap.remove(name);
+    }
+
+    @Override
+    public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
+        String url = request.getUrl().toString();
+        if (!url.startsWith(INTERCEPT_SCHEME + "://")) {
+            return null;
+        }
+        String resourceName = url.substring(INTERCEPT_SCHEME.length() + 3); // strip "x-local://"
+        String filePath = resourceMap.get(resourceName);
+        if (filePath == null) return null;
+        File file = new File(filePath);
+        if (!file.exists()) return null;
+        try {
+            String ext = "";
+            int dot = filePath.lastIndexOf('.');
+            if (dot >= 0) ext = filePath.substring(dot + 1).toLowerCase();
+            String mime = EXT_TO_MIME.containsKey(ext) ? EXT_TO_MIME.get(ext) : "application/octet-stream";
+            boolean isText = false;
+            for (String prefix : TEXT_MIME_PREFIXES) {
+                if (mime.startsWith(prefix)) { isText = true; break; }
+            }
+            String encoding = isText ? "UTF-8" : "binary";
+            WebResourceResponse response = new WebResourceResponse(
+                    mime, encoding, new FileInputStream(file));
+            Map<String, String> headers = new HashMap<>();
+            headers.put("Access-Control-Allow-Origin", "*");
+            response.setResponseHeaders(headers);
+            return response;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    @Override
+    public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+        return delegate.shouldOverrideUrlLoading(view, request);
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public boolean shouldOverrideUrlLoading(WebView view, String url) {
+        return delegate.shouldOverrideUrlLoading(view, url);
+    }
+
+    @Override
+    public void onPageStarted(WebView view, String url, Bitmap favicon) {
+        delegate.onPageStarted(view, url, favicon);
+    }
+
+    @Override
+    public void onPageFinished(WebView view, String url) {
+        delegate.onPageFinished(view, url);
+    }
+
+    @Override
+    public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
+        delegate.onReceivedError(view, request, error);
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
+        delegate.onReceivedError(view, errorCode, description, failingUrl);
+    }
+
+    @Override
+    public void onReceivedHttpError(WebView view, WebResourceRequest request,
+                                    WebResourceResponse errorResponse) {
+        delegate.onReceivedHttpError(view, request, errorResponse);
+    }
+
+    @Override
+    public void onReceivedSslError(WebView view, android.webkit.SslErrorHandler handler,
+                                   android.net.http.SslError error) {
+        delegate.onReceivedSslError(view, handler, error);
+    }
+
+    @Override
+    public void onLoadResource(WebView view, String url) {
+        delegate.onLoadResource(view, url);
+    }
+
+    @Override
+    public void onPageCommitVisible(WebView view, String url) {
+        delegate.onPageCommitVisible(view, url);
+    }
+
+    @Override
+    public void doUpdateVisitedHistory(WebView view, String url, boolean isReload) {
+        delegate.doUpdateVisitedHistory(view, url, isReload);
+    }
+}