@modos189/nativescript-webview-x-gecko 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/gecko-bridge-loader.d.ts

@@ -0,0 +1 @@
+export declare const geckoBridgeJs = "(function(){if(!window.nsWebViewBridge){var i={};window.nsWebViewBridge={on:function(n,e){i[n]||(i[n]=[]),i[n].push(e)},addEventListener:function(n,e){this.on(n,e)},off:function(n,e){if(!n){i={};return}if(i[n]){if(!e){delete i[n];return}i[n]=i[n].filter(function(t){return t!==e}),i[n].length===0&&delete i[n]}},removeEventListener:function(n,e){this.off(n,e)},emit:function(n,e){document.dispatchEvent(new CustomEvent(\"__ns_bridge_emit__\",{detail:{eventName:n,data:JSON.stringify(e)}}))},onNativeEvent:function(n,e){var t=i[n];if(t)for(var f=0;f<t.length&&!(t[f]&&t[f](e)===!1);f++);}};var r=window;typeof CustomEvent<\"u\"?r.dispatchEvent(new CustomEvent(\"ns-bridge-ready\",{detail:r.nsWebViewBridge})):r.dispatchEvent(new Event(\"ns-bridge-ready\")),r.dispatchEvent(new Event(\"ns-brige-ready\"))}})();";

package/gecko-bridge-loader.js

@@ -0,0 +1,4 @@
+// AUTO-GENERATED by tools/scripts/generate-gecko-bridge.js - do not edit directly.
+// Source: packages/webview-x-gecko/www-src/bridge.gecko.js
+export const geckoBridgeJs = '(function(){if(!window.nsWebViewBridge){var i={};window.nsWebViewBridge={on:function(n,e){i[n]||(i[n]=[]),i[n].push(e)},addEventListener:function(n,e){this.on(n,e)},off:function(n,e){if(!n){i={};return}if(i[n]){if(!e){delete i[n];return}i[n]=i[n].filter(function(t){return t!==e}),i[n].length===0&&delete i[n]}},removeEventListener:function(n,e){this.off(n,e)},emit:function(n,e){document.dispatchEvent(new CustomEvent("__ns_bridge_emit__",{detail:{eventName:n,data:JSON.stringify(e)}}))},onNativeEvent:function(n,e){var t=i[n];if(t)for(var f=0;f<t.length&&!(t[f]&&t[f](e)===!1);f++);}};var r=window;typeof CustomEvent<"u"?r.dispatchEvent(new CustomEvent("ns-bridge-ready",{detail:r.nsWebViewBridge})):r.dispatchEvent(new Event("ns-bridge-ready")),r.dispatchEvent(new Event("ns-brige-ready"))}})();';
+//# sourceMappingURL=gecko-bridge-loader.js.map

package/gecko-bridge-loader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gecko-bridge-loader.js","sourceRoot":"","sources":["../../../packages/webview-x-gecko/gecko-bridge-loader.ts"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,2DAA2D;AAC3D,MAAM,CAAC,MAAM,aAAa,GACxB,gyBAAgyB,CAAC"}

package/index.android.d.ts

@@ -4,6 +4,7 @@ export declare const srcProperty: Property<WebViewX, string>;
 export declare const debugModeProperty: Property<WebViewX, boolean>;
 export declare const supportPopupsProperty: Property<WebViewX, boolean>;
 export declare const userAgentProperty: Property<WebViewX, string>;
+export declare const autoInjectJSBridgeProperty: Property<WebViewX, boolean>;
 export declare class WebViewX extends View {
     static get popupNavigateEvent(): string;
     static get loadStartedEvent(): string;
@@ -20,13 +21,22 @@ export declare class WebViewX extends View {
     debugMode: boolean;
     supportPopups: boolean;
     userAgent: string;
+    autoInjectJSBridge: boolean;
+    private _bridgeListener;
     _onPopupNavigate(url: string): boolean;
     _onLoadStarted(url: string): void;
-    _onLoadFinished(url: string, error?: string): void;
+    _onLoadFinished(url: string, error?: string): Promise<void>;
+    emitToWebView(eventName: string, data: any): void;
+    onWebViewEvent(eventName: string, data: any): void;
     _loadProgress(progress: number): void;
     _titleChanged(title: string): void;
     /** Returns the current page title (cached from GeckoDelegates.ContentDelegate.onTitleChange). */
     getTitle(): Promise<string | undefined>;
+    /**
+     * Execute JavaScript in the current page's context and return the result.
+     * Uses a built-in WebExtension bridge; requires GeckoView 65+.
+     */
+    executeJavaScript<T = any>(code: string): Promise<T>;
     createNativeView(): org.mozilla.geckoview.GeckoView;
     disposeNativeView(): void;
 }

package/index.android.js

@@ -1,4 +1,5 @@
 import { Application, View, Property, booleanConverter } from '@nativescript/core';
+import { geckoBridgeJs as _GECKO_BRIDGE_JS } from './gecko-bridge-loader';
 import { LOAD_STARTED_EVENT, LOAD_FINISHED_EVENT, LOAD_PROGRESS_EVENT, TITLE_CHANGED_EVENT } from './common';
 export * from './common';
 const POPUP_NAVIGATE_EVENT = 'popupNavigate';
@@ -20,6 +21,11 @@ export const supportPopupsProperty = new Property({
 export const userAgentProperty = new Property({
     name: 'userAgent',
 });
+export const autoInjectJSBridgeProperty = new Property({
+    name: 'autoInjectJSBridge',
+    defaultValue: true,
+    valueConverter: booleanConverter,
+});
 export class WebViewX extends View {
     constructor() {
         super(...arguments);
@@ -28,6 +34,7 @@ export class WebViewX extends View {
         this._currentUrl = '';
         this._currentTitle = '';
         this._tempSuspendSrcLoading = false;
+        this._bridgeListener = null;
     }
     static get popupNavigateEvent() {
         return POPUP_NAVIGATE_EVENT;
@@ -62,7 +69,7 @@ export class WebViewX extends View {
             url,
         });
     }
-    _onLoadFinished(url, error) {
+    async _onLoadFinished(url, error) {
         if (!error) {
             try {
                 this._tempSuspendSrcLoading = true;
@@ -72,6 +79,14 @@ export class WebViewX extends View {
                 this._tempSuspendSrcLoading = false;
             }
         }
+        if (!error && this.autoInjectJSBridge) {
+            try {
+                await this.executeJavaScript(_GECKO_BRIDGE_JS);
+            }
+            catch {
+                // bridge injection is best-effort
+            }
+        }
         this.notify({
             eventName: LOAD_FINISHED_EVENT,
             object: this,
@@ -79,6 +94,15 @@ export class WebViewX extends View {
             error,
         });
     }
+    emitToWebView(eventName, data) {
+        const code = `window.nsWebViewBridge&&nsWebViewBridge.onNativeEvent(${JSON.stringify(eventName)},${JSON.stringify(data)});`;
+        this.executeJavaScript(code).catch(() => {
+            // ignore — page may not have bridge
+        });
+    }
+    onWebViewEvent(eventName, data) {
+        this.notify({ eventName, data });
+    }
     _loadProgress(progress) {
         this.notify({
             eventName: LOAD_PROGRESS_EVENT,
@@ -100,8 +124,44 @@ export class WebViewX extends View {
     async getTitle() {
         return this._currentTitle || undefined;
     }
+    /**
+     * Execute JavaScript in the current page's context and return the result.
+     * Uses a built-in WebExtension bridge; requires GeckoView 65+.
+     */
+    executeJavaScript(code) {
+        return new Promise((resolve, reject) => {
+            const bridge = com.modos189.webviewxgecko.GeckoJsBridge.getInstance();
+            const id = bridge.nextId();
+            bridge.executeScript(id, code, new com.modos189.webviewxgecko.GeckoJsBridge.JsCallback({
+                onResult(jsonResult) {
+                    resolve(_parseJsResult(jsonResult));
+                },
+                onError(error) {
+                    reject(new Error(error));
+                },
+            }));
+        });
+    }
     createNativeView() {
         const runtime = com.modos189.webviewxgecko.GeckoPopupHelper.getRuntime(Application.android.context);
+        com.modos189.webviewxgecko.GeckoJsBridge.getInstance().setup(runtime);
+        const selfRef = new WeakRef(this);
+        this._bridgeListener = new com.modos189.webviewxgecko.GeckoJsBridge.BridgeEventListener({
+            onBridgeEvent(eventName, dataJson) {
+                const owner = selfRef.deref();
+                if (!owner)
+                    return;
+                let data;
+                try {
+                    data = JSON.parse(dataJson);
+                }
+                catch {
+                    data = dataJson;
+                }
+                owner.onWebViewEvent(eventName, data);
+            },
+        });
+        com.modos189.webviewxgecko.GeckoJsBridge.getInstance().addBridgeListener(this._bridgeListener);
         const session = new org.mozilla.geckoview.GeckoSession();
         this._popupHelper = new com.modos189.webviewxgecko.GeckoPopupHelper(session, this._context, true);
         const interceptor = new com.modos189.webviewxgecko.GeckoPopupHelper.PopupUrlInterceptor({
@@ -127,6 +187,10 @@ export class WebViewX extends View {
         return geckoView;
     }
     disposeNativeView() {
+        if (this._bridgeListener) {
+            com.modos189.webviewxgecko.GeckoJsBridge.getInstance().removeBridgeListener(this._bridgeListener);
+            this._bridgeListener = null;
+        }
         this._popupHelper = null;
         if (this._session) {
             this._session.setProgressDelegate(null);
@@ -152,9 +216,23 @@ export class WebViewX extends View {
     [userAgentProperty.setNative](value) {
         this._session?.getSettings().setUserAgentOverride(value || null);
     }
+    [autoInjectJSBridgeProperty.setNative](_value) {
+        // value stored as a property field; read in _onLoadFinished
+    }
 }
 srcProperty.register(WebViewX);
 debugModeProperty.register(WebViewX);
 supportPopupsProperty.register(WebViewX);
 userAgentProperty.register(WebViewX);
+autoInjectJSBridgeProperty.register(WebViewX);
+function _parseJsResult(jsonString) {
+    if (!jsonString || jsonString === 'null')
+        return null;
+    try {
+        return JSON.parse(jsonString);
+    }
+    catch {
+        return jsonString;
+    }
+}
 //# sourceMappingURL=index.android.js.map

package/index.android.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../packages/webview-x-gecko/index.android.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../packages/webview-x-gecko/index.android.ts"],"names":[],"mappings":"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"}

package/index.d.ts

@@ -4,6 +4,7 @@ import { Property } from '@nativescript/core';
 export declare const srcProperty: Property<WebViewX, string>;
 export declare const debugModeProperty: Property<WebViewX, boolean>;
 export declare const supportPopupsProperty: Property<WebViewX, boolean>;
+export declare const autoInjectJSBridgeProperty: Property<WebViewX, boolean>;
 
 export * from './common';
 import { LoadStartedEventData, LoadFinishedEventData, LoadProgressEventData, TitleChangedEventData } from './common';
@@ -19,6 +20,7 @@ export declare class WebViewX extends View {
   debugMode: boolean;
   supportPopups: boolean;
   userAgent: string;
+  autoInjectJSBridge: boolean;
 
   on(event: 'loadStarted', callback: (args: LoadStartedEventData) => void, thisArg?: any): void;
   on(event: 'loadFinished', callback: (args: LoadFinishedEventData) => void, thisArg?: any): void;
@@ -28,4 +30,13 @@ export declare class WebViewX extends View {
 
   /** Returns the current page title (last value received from the engine). */
   getTitle(): Promise<string | undefined>;
+
+  /** Execute JavaScript in the current page's context and return the result. */
+  executeJavaScript<T = any>(code: string): Promise<T>;
+
+  /** Emit an event into the page's nsWebViewBridge. */
+  emitToWebView(eventName: string, data: any): void;
+
+  /** Called when the page's nsWebViewBridge.emit() fires. Dispatches a NativeScript event. */
+  onWebViewEvent(eventName: string, data: any): void;
 }

package/package.json

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

package/platforms/android/assets/execute-js/background.js

@@ -0,0 +1,26 @@
+'use strict';
+
+// "native" matches the name passed to extension.setMessageDelegate(bridge, "native")
+const port = browser.runtime.connectNative('native');
+
+async function sendMessageToTab(message) {
+  const tabs = await browser.tabs.query({});
+  if (tabs.length === 0) {
+    throw new Error('no tabs available');
+  }
+  return await browser.tabs.sendMessage(tabs[tabs.length - 1].id, message);
+}
+
+// Forward nsWebViewBridge.emit() events from content script to native
+browser.runtime.onMessage.addListener((message) => {
+  if (message.type === 'bridge-emit') {
+    port.postMessage(message);
+    return false;
+  }
+});
+
+port.onMessage.addListener((request) => {
+  sendMessageToTab(request)
+    .then((resp) => port.postMessage(resp))
+    .catch((e) => port.postMessage({ id: request.id, error: e.toString() }));
+});

package/platforms/android/assets/execute-js/content.js

@@ -0,0 +1,36 @@
+'use strict';
+
+browser.runtime.onMessage.addListener((data) => {
+  if (data.inject === undefined) {
+    return Promise.resolve();
+  }
+  try {
+    // wrappedJSObject bypasses Xray vision so eval runs in the page's JS context
+    const result = window.wrappedJSObject.eval(data.inject);
+    let serialized;
+    if (result === undefined) {
+      serialized = 'null';
+    } else {
+      try {
+        serialized = JSON.stringify(result);
+        if (serialized === undefined) serialized = 'null';
+      } catch (_e) {
+        serialized = String(result);
+      }
+    }
+    return Promise.resolve({ id: data.id, result: serialized });
+  } catch (e) {
+    return Promise.resolve({ id: data.id, error: e.toString() });
+  }
+});
+
+// Forward nsWebViewBridge.emit() calls from the page to the native layer.
+// The bridge JS (injected on loadFinished) dispatches this CustomEvent on document
+// when window.nsWebViewBridge.emit() is called.
+document.addEventListener('__ns_bridge_emit__', (event) => {
+  browser.runtime.sendMessage({
+    type: 'bridge-emit',
+    eventName: event.detail.eventName,
+    data: event.detail.data,
+  });
+});

package/platforms/android/assets/execute-js/manifest.json

@@ -0,0 +1,22 @@
+{
+  "manifest_version": 2,
+  "name": "execute-js",
+  "version": "1.0",
+  "browser_specific_settings": {
+    "gecko": {
+      "strict_min_version": "65.0",
+      "id": "execute-js@app.com"
+    }
+  },
+  "background": {
+    "scripts": ["background.js"]
+  },
+  "permissions": ["nativeMessaging", "geckoViewAddons", "tabs", "<all_urls>"],
+  "content_scripts": [
+    {
+      "matches": ["<all_urls>"],
+      "js": ["content.js"],
+      "run_at": "document_start"
+    }
+  ]
+}

package/platforms/android/java/com/modos189/webviewxgecko/GeckoJsBridge.java

@@ -0,0 +1,173 @@
+package com.modos189.webviewxgecko;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.mozilla.geckoview.GeckoRuntime;
+import org.mozilla.geckoview.WebExtension;
+import org.mozilla.geckoview.WebExtensionController;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.lang.ref.WeakReference;
+
+/**
+ * Singleton bridge for executing JavaScript in GeckoView pages via a built-in WebExtension.
+ * NativeScript cannot implement WebExtension delegate interfaces directly (Java 8 default
+ * methods break the DEX proxy factory), so this class acts as the concrete delegate.
+ */
+public class GeckoJsBridge implements WebExtension.MessageDelegate, WebExtension.PortDelegate {
+
+    private static final String TAG = "GeckoJsBridge";
+    private static final String EXTENSION_ID = "execute-js@app.com";
+    private static final String EXTENSION_URL = "resource://android/assets/execute-js/";
+    private static final String PORT_NAME = "native";
+
+    private static volatile GeckoJsBridge sInstance;
+
+    private WebExtension.Port mPort;
+    private final ConcurrentHashMap<String, JsCallback> mPendingCallbacks = new ConcurrentHashMap<>();
+    // Accessed only on main thread after posting via mMainHandler
+    private final List<JSONObject> mPendingMessages = new ArrayList<>();
+    private final Handler mMainHandler = new Handler(Looper.getMainLooper());
+    private final AtomicInteger mIdCounter = new AtomicInteger(0);
+
+    public interface JsCallback {
+        void onResult(String jsonResult);
+        void onError(String error);
+    }
+
+    public interface BridgeEventListener {
+        void onBridgeEvent(String eventName, String dataJson);
+    }
+
+    private final CopyOnWriteArrayList<WeakReference<BridgeEventListener>> mBridgeListeners = new CopyOnWriteArrayList<>();
+
+    public void addBridgeListener(BridgeEventListener listener) {
+        mBridgeListeners.add(new WeakReference<>(listener));
+    }
+
+    public void removeBridgeListener(BridgeEventListener listener) {
+        mBridgeListeners.removeIf(ref -> {
+            BridgeEventListener l = ref.get();
+            return l == null || l == listener;
+        });
+    }
+
+    private void notifyBridgeListeners(String eventName, String dataJson) {
+        for (WeakReference<BridgeEventListener> ref : mBridgeListeners) {
+            BridgeEventListener listener = ref.get();
+            if (listener != null) {
+                listener.onBridgeEvent(eventName, dataJson);
+            }
+        }
+    }
+
+    public static GeckoJsBridge getInstance() {
+        if (sInstance == null) {
+            synchronized (GeckoJsBridge.class) {
+                if (sInstance == null) {
+                    sInstance = new GeckoJsBridge();
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    private GeckoJsBridge() {}
+
+    public String nextId() {
+        return String.valueOf(mIdCounter.incrementAndGet());
+    }
+
+    /** Idempotent - safe to call on every WebViewX creation. */
+    public void setup(GeckoRuntime runtime) {
+        runtime.getWebExtensionController()
+            .ensureBuiltIn(EXTENSION_URL, EXTENSION_ID)
+            .accept(
+                extension -> mMainHandler.post(() -> {
+                    if (extension == null) return;
+                    // Disable then re-enable so the background script reconnects
+                    // and triggers onConnect even if the extension was already loaded.
+                    runtime.getWebExtensionController()
+                        .disable(extension, WebExtensionController.EnableSource.APP);
+                    runtime.getWebExtensionController()
+                        .enable(extension, WebExtensionController.EnableSource.APP);
+                    extension.setMessageDelegate(GeckoJsBridge.this, PORT_NAME);
+                }),
+                e -> Log.e(TAG, "Failed to install WebExtension", e)
+            );
+    }
+
+    public void executeScript(final String id, final String code, final JsCallback callback) {
+        final JSONObject msg;
+        try {
+            msg = new JSONObject();
+            msg.put("id", id);
+            msg.put("inject", code);
+        } catch (JSONException e) {
+            callback.onError(e.getMessage());
+            return;
+        }
+
+        mPendingCallbacks.put(id, callback);
+
+        mMainHandler.post(() -> {
+            if (mPort != null) {
+                mPort.postMessage(msg);
+            } else {
+                mPendingMessages.add(msg);
+            }
+        });
+    }
+
+    @Override
+    public void onConnect(WebExtension.Port port) {
+        mPort = port;
+        port.setDelegate(this);
+
+        // Flush any calls that arrived before the port was ready
+        for (JSONObject msg : mPendingMessages) {
+            port.postMessage(msg);
+        }
+        mPendingMessages.clear();
+    }
+
+    @Override
+    public void onPortMessage(Object message, WebExtension.Port port) {
+        if (!(message instanceof JSONObject)) return;
+        final JSONObject obj = (JSONObject) message;
+        try {
+            if ("bridge-emit".equals(obj.optString("type"))) {
+                final String eventName = obj.optString("eventName", "");
+                final String data = obj.optString("data", "null");
+                mMainHandler.post(() -> notifyBridgeListeners(eventName, data));
+                return;
+            }
+
+            final String id = obj.getString("id");
+            final JsCallback callback = mPendingCallbacks.remove(id);
+            if (callback == null) return;
+
+            if (obj.has("error")) {
+                callback.onError(obj.getString("error"));
+            } else {
+                // optString falls back to "null" when key is absent or value is JSON null
+                callback.onResult(obj.optString("result", "null"));
+            }
+        } catch (JSONException e) {
+            Log.e(TAG, "Error processing JS result message", e);
+        }
+    }
+
+    @Override
+    public void onDisconnect(WebExtension.Port port) {
+        mPort = null;
+    }
+}