catalyst-core-internal 0.1.2 → 0.1.3

package/dist/native/iosnativeWebView/iosnativeWebViewTests/BridgeCommandHandlerSecurityTests.swift

@@ -0,0 +1,212 @@
+import XCTest
+import WebKit
+@testable import CatalystCore
+
+/**
+ * Unit tests for BridgeCommandHandler — security commands.
+ *
+ * Coverage:
+ * 1. setScreenSecure routing (3 tests)
+ * 2. getScreenSecure routing (2 tests)
+ * 3. clearWebData routing (3 tests)
+ *
+ * Total: 8 tests
+ *
+ * Each test drives the full bridge pipeline (NativeBridge → BridgeCommandHandler)
+ * via a MockWKWebView and captures the evaluateJavaScript call that the delegate
+ * would fire back to the web layer.
+ *
+ * MockWKWebView and MockWKScriptMessage are defined in NativeBridgeTests.swift
+ * and BridgeMessageValidatorTests.swift respectively (shared across the test target).
+ */
+final class BridgeCommandHandlerSecurityTests: XCTestCase {
+
+    var bridge: NativeBridge!
+    var mockWebView: MockWKWebView!
+    var mockViewController: UIViewController!
+
+    override func setUp() {
+        super.setUp()
+        mockWebView = MockWKWebView()
+        mockViewController = UIViewController()
+        bridge = NativeBridge(webView: mockWebView, viewController: mockViewController)
+        bridge.register()
+        // Ensure a clean screen-secure state before each test
+        ScreenSecureManager.shared.setScreenSecure(false)
+    }
+
+    override func tearDown() {
+        bridge.unregister()
+        bridge = nil
+        mockWebView = nil
+        mockViewController = nil
+        ScreenSecureManager.shared.setScreenSecure(false)
+        super.tearDown()
+    }
+
+    // ============================================================
+    // CATEGORY 1: setScreenSecure routing (3 tests)
+    // ============================================================
+
+    func testSetScreenSecure_Enable_FiresOnScreenSecureSetCallback() {
+        let exp = expectation(description: "ON_SCREEN_SECURE_SET callback fired")
+
+        mockWebView.onEvaluateJavaScript = { script in
+            if script.contains("ON_SCREEN_SECURE_SET") {
+                exp.fulfill()
+            }
+        }
+
+        let message = createMessage(command: "setScreenSecure", data: ["enable": true])
+        bridge.userContentController(mockWebView.configuration.userContentController,
+                                     didReceive: message)
+
+        wait(for: [exp], timeout: 2.0)
+    }
+
+    func testSetScreenSecure_Enable_CallbackContainsSecureTrue() {
+        let exp = expectation(description: "ON_SCREEN_SECURE_SET payload has secure:true")
+
+        mockWebView.onEvaluateJavaScript = { script in
+            if script.contains("ON_SCREEN_SECURE_SET") {
+                XCTAssertTrue(
+                    script.contains("\"secure\"") || script.contains("secure"),
+                    "Callback should include secure field"
+                )
+                XCTAssertTrue(
+                    script.contains("true"),
+                    "secure should be true after enabling"
+                )
+                exp.fulfill()
+            }
+        }
+
+        let message = createMessage(command: "setScreenSecure", data: ["enable": true])
+        bridge.userContentController(mockWebView.configuration.userContentController,
+                                     didReceive: message)
+
+        wait(for: [exp], timeout: 2.0)
+    }
+
+    func testSetScreenSecure_InvalidParams_FiresErrorCallback() {
+        // Passing a non-dict, non-string param is handled by the fallback in
+        // BridgeCommandHandler.setScreenSecure — it fires ON_SCREEN_SECURE_ERROR.
+        let exp = expectation(description: "ON_SCREEN_SECURE_ERROR fired for nil params")
+
+        mockWebView.onEvaluateJavaScript = { script in
+            if script.contains("ON_SCREEN_SECURE_ERROR") {
+                exp.fulfill()
+            }
+        }
+
+        // Route via bridge with data that contains no "enable" key at all
+        let message = createMessage(command: "setScreenSecure", data: [:])
+        bridge.userContentController(mockWebView.configuration.userContentController,
+                                     didReceive: message)
+
+        // The empty dict triggers the else branch → ON_SCREEN_SECURE_ERROR
+        wait(for: [exp], timeout: 2.0)
+    }
+
+    // ============================================================
+    // CATEGORY 2: getScreenSecure routing (2 tests)
+    // ============================================================
+
+    func testGetScreenSecure_FiresOnScreenSecureStatusCallback() {
+        let exp = expectation(description: "ON_SCREEN_SECURE_STATUS callback fired")
+
+        mockWebView.onEvaluateJavaScript = { script in
+            if script.contains("ON_SCREEN_SECURE_STATUS") {
+                exp.fulfill()
+            }
+        }
+
+        let message = createMessage(command: "getScreenSecure", data: [:])
+        bridge.userContentController(mockWebView.configuration.userContentController,
+                                     didReceive: message)
+
+        wait(for: [exp], timeout: 2.0)
+    }
+
+    func testGetScreenSecure_ReflectsCurrentState() {
+        // Set state first, then query it via the bridge
+        ScreenSecureManager.shared.setScreenSecure(true)
+
+        let exp = expectation(description: "ON_SCREEN_SECURE_STATUS reflects secure:true")
+
+        mockWebView.onEvaluateJavaScript = { script in
+            if script.contains("ON_SCREEN_SECURE_STATUS") {
+                XCTAssertTrue(script.contains("true"),
+                              "Status callback should reflect secure=true")
+                exp.fulfill()
+            }
+        }
+
+        let message = createMessage(command: "getScreenSecure", data: [:])
+        bridge.userContentController(mockWebView.configuration.userContentController,
+                                     didReceive: message)
+
+        wait(for: [exp], timeout: 2.0)
+    }
+
+    // ============================================================
+    // CATEGORY 3: clearWebData routing (3 tests)
+    // ============================================================
+
+    func testClearWebData_WhenWebViewPresent_FiresOnWebDataClearedCallback() {
+        // BridgeCommandHandler needs a webView injected to proceed past the guard
+        // NativeBridge injects it during register(), so the mock is already set.
+        let exp = expectation(description: "ON_WEB_DATA_CLEARED callback fired")
+
+        mockWebView.onEvaluateJavaScript = { script in
+            if script.contains("ON_WEB_DATA_CLEARED") {
+                exp.fulfill()
+            }
+        }
+
+        let message = createMessage(command: "clearWebData", data: [:])
+        bridge.userContentController(mockWebView.configuration.userContentController,
+                                     didReceive: message)
+
+        // clearWebData is async (WKWebsiteDataStore removal) — allow extra time
+        wait(for: [exp], timeout: 5.0)
+    }
+
+    func testClearWebData_SuccessPayloadContainsSuccessTrue() {
+        let exp = expectation(description: "clearWebData success payload has success:true")
+
+        mockWebView.onEvaluateJavaScript = { script in
+            if script.contains("ON_WEB_DATA_CLEARED") {
+                XCTAssertTrue(script.contains("true"),
+                              "success field should be true in cleared callback")
+                exp.fulfill()
+            }
+        }
+
+        let message = createMessage(command: "clearWebData", data: [:])
+        bridge.userContentController(mockWebView.configuration.userContentController,
+                                     didReceive: message)
+
+        wait(for: [exp], timeout: 5.0)
+    }
+
+    func testClearWebData_CommandAcceptedByValidator() {
+        // Validates command reaches the handler without being rejected by BridgeMessageValidator
+        let messageBody: [String: Any] = ["command": "clearWebData", "data": [:]]
+        let message = MockWKScriptMessage(name: "NativeBridge", body: messageBody)
+        let result = BridgeMessageValidator.validate(message: message)
+
+        XCTAssertTrue(result.isValid, "clearWebData should pass BridgeMessageValidator")
+        XCTAssertEqual(result.command, "clearWebData")
+        XCTAssertNil(result.error)
+    }
+
+    // ============================================================
+    // Helpers
+    // ============================================================
+
+    private func createMessage(command: String, data: [String: Any]) -> WKScriptMessage {
+        let body: [String: Any] = ["command": command, "data": data]
+        return MockWKScriptMessage(name: "NativeBridge", body: body)
+    }
+}

package/dist/native/iosnativeWebView/iosnativeWebViewTests/FrameworkServerUtilsTests.swift

@@ -47,12 +47,16 @@ final class FrameworkServerUtilsTests: XCTestCase {
     // CATEGORY 1: HTTPS Server Setup (2 tests)
     // ========================================
 
-    func testHTTPSServerSetup_ServerInitialization() {
+    func testHTTPSServerSetup_ServerInitialization() async {
         // Test server initialization
 
         // Note: Server may fail to start in test environment due to network restrictions
-        // This test verifies the API works without crashing
-        let started = frameworkServer.startServer()
+        // This test verifies the API works without crashing.
+        // Run startServer() off the main thread to avoid UI-responsiveness warnings
+        // (NWListener setup must not block the main thread).
+        let started = await Task.detached(priority: .userInitiated) {
+            self.frameworkServer.startServer()
+        }.value
 
         // If server starts successfully, verify state
         if started {
@@ -143,8 +147,14 @@ final class FrameworkServerUtilsTests: XCTestCase {
         // Start server first
         let started = frameworkServer.startServer()
 
-        // Only test file serving if server started
+        // Wait briefly for NWListener stateUpdateHandler to fire (it's async on a background queue).
+        // The listener can flip isServerRunning back to false if it fails after startServer() returns.
         if started {
+            Thread.sleep(forTimeInterval: 0.3)
+        }
+
+        // Only test file serving if server is still running after NWListener settled
+        if started && frameworkServer.isRunning() {
             // Create a temporary test file
             let testData = "Test file content".data(using: .utf8)!
             let tempURL = FileManager.default.temporaryDirectory

package/dist/native/iosnativeWebView/iosnativeWebViewTests/PluginBridgeTests.swift

@@ -0,0 +1,160 @@
+import XCTest
+import WebKit
+import UIKit
+@testable import CatalystCore
+
+final class PluginBridgeTests: XCTestCase {
+
+    private var bridge: PluginBridge!
+    private var mockWebView: PluginMockWKWebView!
+    private var mockViewController: UIViewController!
+    private var testExpectation: XCTestExpectation!
+
+    @MainActor
+    override func setUp() {
+        super.setUp()
+        mockWebView = PluginMockWKWebView()
+        mockViewController = UIViewController()
+        bridge = PluginBridge(webView: mockWebView, viewController: mockViewController)
+        bridge.register()
+    }
+
+    @MainActor
+    override func tearDown() {
+        bridge.unregister()
+        bridge = nil
+        mockWebView = nil
+        mockViewController = nil
+        testExpectation = nil
+        super.tearDown()
+    }
+
+    @MainActor
+    func testMessageHandling_InvalidHandler_EmitsInvalidPayloadError() async {
+        testExpectation = expectation(description: "Invalid handler should emit bridge error")
+        mockWebView.onEvaluateJavaScript = { script in
+            if script.contains("PLUGIN_BRIDGE_ERROR") && script.contains("INVALID_PAYLOAD") {
+                self.testExpectation.fulfill()
+            }
+        }
+
+        let message = PluginMockScriptMessage(
+            name: "NativeBridge",
+            body: [
+                "pluginId": "device-info-plugin",
+                "command": "getDeviceInfo"
+            ]
+        )
+
+        bridge.handleMessage(message)
+
+        await fulfillment(of: [testExpectation], timeout: 2.0)
+    }
+
+    @MainActor
+    func testMessageHandling_UnknownPlugin_EmitsPluginNotFoundError() async {
+        testExpectation = expectation(description: "Unknown plugin should emit plugin not found error")
+        mockWebView.onEvaluateJavaScript = { script in
+            if script.contains("PLUGIN_BRIDGE_ERROR") && script.contains("PLUGIN_NOT_FOUND") {
+                self.testExpectation.fulfill()
+            }
+        }
+
+        let message = PluginMockScriptMessage(
+            name: "PluginBridge",
+            body: [
+                "pluginId": "missing-plugin",
+                "command": "ping",
+                "requestId": "req-42"
+            ]
+        )
+
+        bridge.handleMessage(message)
+
+        await fulfillment(of: [testExpectation], timeout: 2.0)
+    }
+
+    @MainActor
+    func testCallbackHandling_ArbitraryCallback_DispatchesPluginEnvelope() async {
+        testExpectation = expectation(description: "Arbitrary callback should dispatch plugin envelope")
+        mockWebView.onEvaluateJavaScript = { script in
+            if script.contains("PluginBridgeWeb.dispatch") &&
+                script.contains("sync-plugin") &&
+                script.contains("ON_FAILURE") &&
+                script.contains("req-9") &&
+                script.contains("syncData") {
+                self.testExpectation.fulfill()
+            }
+        }
+
+        let context = PluginBridgeContext(
+            webView: mockWebView,
+            viewController: mockViewController,
+            pluginId: "sync-plugin",
+            command: "syncData",
+            requestId: "req-9"
+        )
+
+        context.callback(eventName: "ON_FAILURE", data: ["reason": "network"])
+
+        await fulfillment(of: [testExpectation], timeout: 2.0)
+    }
+
+    @MainActor
+    func testCallbackHandling_ValidCallback_DispatchesPluginEnvelope() async {
+        testExpectation = expectation(description: "Valid callback should dispatch plugin envelope")
+        mockWebView.onEvaluateJavaScript = { script in
+            if script.contains("PluginBridgeWeb.dispatch") &&
+                script.contains("sync-plugin") &&
+                script.contains("ON_SUCCESS") &&
+                script.contains("req-10") {
+                self.testExpectation.fulfill()
+            }
+        }
+
+        let context = PluginBridgeContext(
+            webView: mockWebView,
+            viewController: mockViewController,
+            pluginId: "sync-plugin",
+            command: "syncData",
+            requestId: "req-10"
+        )
+
+        context.callback(eventName: "ON_SUCCESS", data: ["status": "ok"])
+
+        await fulfillment(of: [testExpectation], timeout: 2.0)
+    }
+}
+
+private final class PluginMockWKWebView: WKWebView {
+    var onEvaluateJavaScript: ((String) -> Void)?
+    var evaluatedScripts: [String] = []
+
+    override init(frame: CGRect, configuration: WKWebViewConfiguration) {
+        super.init(frame: frame, configuration: configuration)
+    }
+
+    convenience init() {
+        let config = WKWebViewConfiguration()
+        self.init(frame: .zero, configuration: config)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    @MainActor
+    override func evaluateJavaScript(_ javaScriptString: String, completionHandler: ((Any?, Error?) -> Void)? = nil) {
+        evaluatedScripts.append(javaScriptString)
+        onEvaluateJavaScript?(javaScriptString)
+
+        DispatchQueue.main.async {
+            completionHandler?(nil, nil)
+        }
+    }
+}
+
+private struct PluginMockScriptMessage: PluginBridgeMessage {
+    let name: String
+    let body: Any
+}

package/dist/native/iosnativeWebView/iosnativeWebViewTests/ScreenSecureManagerTests.swift

@@ -0,0 +1,121 @@
+import XCTest
+@testable import CatalystCore
+
+/**
+ * Unit tests for ScreenSecureManager
+ *
+ * Coverage:
+ * 1. State management (3 tests)
+ * 2. setScreenSecure behaviour (3 tests)
+ * 3. Overlay race condition guard (2 tests)
+ *
+ * Total: 8 tests
+ *
+ * Note: UIWindow creation and scene observation require a running app / UI host.
+ * Tests here focus on the state machine and guard logic that can be exercised
+ * without a UIWindowScene. Overlay installation side-effects are verified
+ * indirectly via the guard flags and isScreenSecure state.
+ */
+final class ScreenSecureManagerTests: XCTestCase {
+
+    var manager: ScreenSecureManager!
+
+    override func setUp() {
+        super.setUp()
+        // Use the shared singleton; reset state by disabling screen security
+        manager = ScreenSecureManager.shared
+        manager.setScreenSecure(false)
+    }
+
+    override func tearDown() {
+        // Leave the singleton clean for other tests
+        manager.setScreenSecure(false)
+        super.tearDown()
+    }
+
+    // ============================================================
+    // CATEGORY 1: State management (3 tests)
+    // ============================================================
+
+    func testInitialState_IsNotSecure() {
+        // After setUp calls setScreenSecure(false), isScreenSecure must be false
+        XCTAssertFalse(manager.isScreenSecure, "Initial state should not be secure")
+    }
+
+    func testSetScreenSecure_True_UpdatesState() {
+        manager.setScreenSecure(true)
+
+        XCTAssertTrue(manager.isScreenSecure, "isScreenSecure should be true after enabling")
+    }
+
+    func testSetScreenSecure_False_UpdatesState() {
+        manager.setScreenSecure(true)
+        manager.setScreenSecure(false)
+
+        XCTAssertFalse(manager.isScreenSecure, "isScreenSecure should be false after disabling")
+    }
+
+    // ============================================================
+    // CATEGORY 2: setScreenSecure behaviour (3 tests)
+    // ============================================================
+
+    func testSetScreenSecure_EnableThenDisable_StateIsConsistent() {
+        manager.setScreenSecure(true)
+        XCTAssertTrue(manager.isScreenSecure)
+
+        manager.setScreenSecure(false)
+        XCTAssertFalse(manager.isScreenSecure)
+
+        // Re-enable
+        manager.setScreenSecure(true)
+        XCTAssertTrue(manager.isScreenSecure)
+    }
+
+    func testSetScreenSecure_DisableWhenAlreadyDisabled_NoStateChange() {
+        // Should be a no-op and not throw
+        manager.setScreenSecure(false)
+        manager.setScreenSecure(false)
+
+        XCTAssertFalse(manager.isScreenSecure, "Repeated disable should leave state as false")
+    }
+
+    func testSetScreenSecure_EnableWhenAlreadyEnabled_NoStateChange() {
+        manager.setScreenSecure(true)
+        manager.setScreenSecure(true)
+
+        XCTAssertTrue(manager.isScreenSecure, "Repeated enable should leave state as true")
+    }
+
+    // ============================================================
+    // CATEGORY 3: Overlay race condition guard (2 tests)
+    // ============================================================
+
+    func testSceneWillDeactivate_WhenNotSecure_OverlayNotInstalled() {
+        // When isScreenSecure is false, sceneWillDeactivate must be a no-op.
+        // We verify by checking state is still false after the notification fires.
+        manager.setScreenSecure(false)
+
+        NotificationCenter.default.post(
+            name: UIScene.willDeactivateNotification,
+            object: nil
+        )
+
+        // State must not have changed
+        XCTAssertFalse(manager.isScreenSecure,
+                       "State should remain false when secure mode is off")
+    }
+
+    func testSceneDidActivate_AfterEnable_StateUnchanged() {
+        // sceneDidActivate removes the overlay but does NOT reset isScreenSecure.
+        manager.setScreenSecure(true)
+
+        NotificationCenter.default.post(
+            name: UIScene.didActivateNotification,
+            object: nil
+        )
+
+        // The secure flag must survive a return-to-foreground event
+        XCTAssertTrue(manager.isScreenSecure,
+                      "isScreenSecure should remain true after scene reactivation")
+    }
+}

package/dist/native/iosnativeWebView/iosnativeWebViewTests/WebViewTests.swift

@@ -38,7 +38,7 @@ final class WebViewTests: XCTestCase {
         viewModel = WebViewModel()
 
         // Create navigation delegate
-        navigationDelegate = WebViewNavigationDelegate(viewModel: viewModel)
+        navigationDelegate = WebViewNavigationDelegate(viewModel: viewModel, initialURL: nil)
 
         // Create a basic WKWebView for testing
         let config = WKWebViewConfiguration()
@@ -124,7 +124,7 @@ final class WebViewTests: XCTestCase {
     // ========================================
 
     @MainActor
-    func testNavigationHandling_AllowedURLLoading() {
+    func testNavigationHandling_AllowedURLLoading() async {
         // Test that allowed URLs are permitted for navigation
 
         let allowedURL = URL(string: "https://example.com")!
@@ -138,29 +138,23 @@ final class WebViewTests: XCTestCase {
         #endif
 
         let navigationAction = createNavigationAction(url: allowedURL)
-        var decisionReceived = false
+        let expectation = XCTestExpectation(description: "Navigation decision received")
         var allowedDecision = false
 
         navigationDelegate.webView(mockWebView,
                                    decidePolicyFor: navigationAction) { policy in
-            decisionReceived = true
             allowedDecision = (policy == .allow)
-        }
-
-        // Wait briefly for async decision
-        let expectation = XCTestExpectation(description: "Navigation decision")
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
             expectation.fulfill()
         }
-        wait(for: [expectation], timeout: 1.0)
 
-        XCTAssertTrue(decisionReceived, "Navigation decision should be received")
+        await fulfillment(of: [expectation], timeout: 2.0)
+
         XCTAssertTrue(allowedDecision || !URLWhitelistManager.shared.isAccessControlEnabled,
                      "Allowed URL should be permitted")
     }
 
     @MainActor
-    func testNavigationHandling_BlockedURLNavigation() {
+    func testNavigationHandling_BlockedURLNavigation() async {
         // Test that blocked URLs are rejected
 
         let blockedURL = URL(string: "https://blocked.com")!
@@ -174,23 +168,17 @@ final class WebViewTests: XCTestCase {
         #endif
 
         let navigationAction = createNavigationAction(url: blockedURL)
-        var decisionReceived = false
+        let expectation = XCTestExpectation(description: "Navigation decision received")
         var blockedDecision = false
 
         navigationDelegate.webView(mockWebView,
                                    decidePolicyFor: navigationAction) { policy in
-            decisionReceived = true
             blockedDecision = (policy == .cancel)
-        }
-
-        // Wait briefly for async decision
-        let expectation = XCTestExpectation(description: "Navigation decision")
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
             expectation.fulfill()
         }
-        wait(for: [expectation], timeout: 1.0)
 
-        XCTAssertTrue(decisionReceived, "Navigation decision should be received")
+        await fulfillment(of: [expectation], timeout: 2.0)
+
         XCTAssertTrue(blockedDecision, "Blocked URL should be cancelled")
     }
 

package/dist/native/plugin-bridge/PluginBridge.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.default=void 0;class PluginNativeBridge{constructor(){this.handlers=new Map();this.requestCount=0;this.isInitialized=false;}createRequestId=()=>{this.requestCount+=1;return`plugin_${Date.now()}_${this.requestCount}`;};normalizeRequiredString=(value,fieldName)=>{if(typeof value!=="string"||!value.trim()){throw new Error(`${fieldName} must be a non-empty string`);}return value.trim();};normalizeCommand=command=>{if(command==null){return null;}return this.normalizeRequiredString(command,"command");};getHandlerKey=({pluginId,eventName,command=null}={})=>{return JSON.stringify([this.normalizeRequiredString(pluginId,"pluginId"),this.normalizeRequiredString(eventName,"eventName"),this.normalizeCommand(command)]);};getHandlerSet=(key,create=false)=>{let handlers=this.handlers.get(key);if(!handlers&&create){handlers=new Set();this.handlers.set(key,handlers);}return handlers||null;};addHandler=({pluginId,eventName,command}={},handler)=>{if(typeof handler!=="function"){throw new Error("handler must be a function");}this.getHandlerSet(this.getHandlerKey({pluginId,eventName,command}),true).add(handler);};removeHandler=({pluginId,eventName,command}={},handler)=>{const key=this.getHandlerKey({pluginId,eventName,command});const handlers=this.getHandlerSet(key,false);if(!handlers){return false;}if(handler==null){handlers.clear();this.handlers.delete(key);return true;}const removed=handlers.delete(handler);if(handlers.size===0){this.handlers.delete(key);}return removed;};ensureInitialized=()=>{if(typeof window==="undefined"||this.isInitialized){return this;}window.PluginBridgeWeb=window.PluginBridgeWeb||{};window.PluginBridgeWeb.callback=this.dispatchCallback;window.PluginBridgeWeb.dispatch=message=>{let parsed=message;if(typeof parsed==="string"){try{parsed=JSON.parse(parsed);}catch{return false;}}if(!parsed||typeof parsed!=="object"){return false;}const payload=Object.prototype.hasOwnProperty.call(parsed,"payload")?parsed.payload:null;return this.dispatchCallback(parsed.pluginId,parsed.eventName,payload,parsed.requestId??null,parsed.command??null);};this.isInitialized=true;return this;};hasAndroidBridge=()=>typeof window!=="undefined"&&!!window.PluginBridge;hasIOSBridge=()=>typeof window!=="undefined"&&!!window.webkit?.messageHandlers?.PluginBridge;init=()=>this.ensureInitialized();assertInitialized=()=>{if(!this.isInitialized){throw new Error("PluginBridge.init() must be called before using emit() or register()");}};reportHandlerError=error=>{if(typeof queueMicrotask==="function"){queueMicrotask(()=>{throw error;});return;}setTimeout(()=>{throw error;},0);};emit=({pluginId,command,data=null}={})=>{const normalizedPluginId=this.normalizeRequiredString(pluginId,"pluginId");const normalizedCommand=this.normalizeRequiredString(command,"command");if(typeof window==="undefined"){throw new Error("PluginBridge is not available in this environment");}this.assertInitialized();const payload={pluginId:normalizedPluginId,command:normalizedCommand,data,requestId:this.createRequestId()};if(this.hasAndroidBridge()){window.PluginBridge.emit(JSON.stringify(payload));return;}if(this.hasIOSBridge()){window.webkit.messageHandlers.PluginBridge.postMessage(payload);return;}throw new Error("PluginBridge is not available in this environment");};register=({pluginId,eventName,command,handler}={})=>{this.assertInitialized();this.addHandler({pluginId,eventName,command},handler);return()=>this.removeHandler({pluginId,eventName,command},handler);};unregister=({pluginId,eventName,command,handler}={})=>{if(typeof handler!=="function"){throw new Error("handler must be a function");}return this.removeHandler({pluginId,eventName,command},handler);};dispatchCallback=(pluginId,eventName,payload,requestId=null,command=null)=>{void requestId;const normalizedPluginId=typeof pluginId==="string"&&pluginId.trim()?pluginId.trim():null;const normalizedEventName=typeof eventName==="string"&&eventName.trim()?eventName.trim():null;if(normalizedPluginId==null||normalizedEventName==null){return false;}const normalizedCommand=typeof command==="string"&&command.trim()?command.trim():null;const toCall=new Set();const collectHandlers=commandScope=>{const handlers=this.getHandlerSet(JSON.stringify([normalizedPluginId,normalizedEventName,commandScope]),false);if(!handlers){return;}handlers.forEach(handler=>{toCall.add(handler);});};if(normalizedCommand!=null){collectHandlers(normalizedCommand);}collectHandlers(null);if(toCall.size===0){return false;}const meta={pluginId:normalizedPluginId,eventName:normalizedEventName,command:normalizedCommand};toCall.forEach(handler=>{try{handler(payload,meta);}catch(error){this.reportHandlerError(error);}});return true;};}const pluginNativeBridge=new PluginNativeBridge();var _default=exports.default=pluginNativeBridge;

package/dist/native/pluginComposerAndroid.js

@@ -0,0 +1,9 @@
+"use strict";const fs=require("fs");const path=require("path");const{discoverInternalPlugins}=require("./internalPluginUtils.js");const PLUGINS_PACKAGE_PARTS=["io","yourname","androidproject","plugins"];function isDir(dirPath){return fs.existsSync(dirPath)&&fs.statSync(dirPath).isDirectory();}function ensureDir(dirPath){if(!fs.existsSync(dirPath)){fs.mkdirSync(dirPath,{recursive:true});}}function sanitizeForPath(value){return value.replace(/[^a-zA-Z0-9_-]/g,"_");}function mustBeNonEmptyString(value,fieldName,sourcePath){if(typeof value!=="string"||!value.trim()){throw new Error(`Invalid '${fieldName}' in ${sourcePath}`);}return value.trim();}function asUniqueSorted(values){return[...new Set(values)].sort();}function parsePluginToggleConfig(pluginConfig){if(pluginConfig==null){return{};}if(typeof pluginConfig!=="object"||Array.isArray(pluginConfig)){throw new Error("'WEBVIEW_CONFIG.plugins' must be an object with boolean values");}const toggles={};for(const[key,value]of Object.entries(pluginConfig)){const normalizedKey=mustBeNonEmptyString(key,"plugins.<key>","WEBVIEW_CONFIG");if(typeof value!=="boolean"){throw new Error(`'WEBVIEW_CONFIG.plugins.${normalizedKey}' must be boolean`);}toggles[normalizedKey]=value;}return toggles;}function selectPluginsByConfig(plugins,pluginConfig,log){const toggles=parsePluginToggleConfig(pluginConfig);const matchedKeys=new Set();const selected=[];for(const plugin of plugins){const selectorKeys=plugin.configKey?[plugin.configKey,plugin.id]:[plugin.id];const matches=[];for(const key of selectorKeys){if(Object.prototype.hasOwnProperty.call(toggles,key)){matches.push({key,value:toggles[key]});matchedKeys.add(key);}}const uniqueValues=[...new Set(matches.map(entry=>entry.value))];if(uniqueValues.length>1){throw new Error(`Conflicting toggle values for plugin '${plugin.id}' across keys: ${matches.map(entry=>`${entry.key}=${entry.value}`).join(", ")}`);}const enabled=matches.length===0?false:matches[0].value;if(enabled){selected.push(plugin);}else{log(`Plugin disabled by config: ${plugin.id}`,"info");}}const unknownKeys=Object.keys(toggles).filter(key=>!matchedKeys.has(key));if(unknownKeys.length>0){throw new Error(`Unknown plugin toggle key(s) in WEBVIEW_CONFIG.plugins: ${unknownKeys.join(", ")}`);}return selected;}function parseDependency(dependency,pluginId){const parts=dependency.split(":");if(parts.length<3){throw new Error(`Dependency '${dependency}' in plugin '${pluginId}' must be in 'group:artifact:version' format`);}return{key:`${parts[0]}:${parts[1]}`,version:parts.slice(2).join(":")};}function validatePlugins(plugins){const pluginIds=new Set();const configKeys=new Set();const dependencies=new Map();const selectorKeys=new Map();for(const plugin of plugins){if(pluginIds.has(plugin.id)){throw new Error(`Duplicate plugin id detected: ${plugin.id}`);}pluginIds.add(plugin.id);if(plugin.configKey){if(configKeys.has(plugin.configKey)){throw new Error(`Duplicate configKey detected: ${plugin.configKey}`);}configKeys.add(plugin.configKey);}for(const[field,selector]of[["id",plugin.id],["configKey",plugin.configKey]]){if(!selector){continue;}const existing=selectorKeys.get(selector);if(existing&&existing.pluginId!==plugin.id){throw new Error(`Plugin selector collision for '${selector}': '${existing.pluginId}' (${existing.field}) conflicts with '${plugin.id}' (${field})`);}selectorKeys.set(selector,{pluginId:plugin.id,field});}if(new Set(plugin.commands).size!==plugin.commands.length){throw new Error(`Duplicate command(s) detected within plugin '${plugin.id}'`);}for(const dependency of plugin.android?.dependencies||[]){const parsed=parseDependency(dependency,plugin.id);const existing=dependencies.get(parsed.key);if(existing&&existing.version!==parsed.version){throw new Error(`Dependency version conflict for '${parsed.key}': '${existing.version}' in '${existing.pluginId}', '${parsed.version}' in '${plugin.id}'`);}if(!existing){dependencies.set(parsed.key,{version:parsed.version,pluginId:plugin.id});}}}}function selectPluginsForPlatform(plugins,platform,log){const selected=[];for(const plugin of plugins){if(plugin.platforms.includes(platform)){selected.push(plugin);continue;}log(`Plugin enabled but not supported on ${platform}: ${plugin.id}`,"info");}return selected;}function walkFiles(rootDir,predicate,results=[]){if(!isDir(rootDir)){return results;}for(const entry of fs.readdirSync(rootDir,{withFileTypes:true})){const fullPath=path.join(rootDir,entry.name);if(entry.isDirectory()){walkFiles(fullPath,predicate,results);continue;}if(predicate(entry.name,fullPath)){results.push(fullPath);}}return results;}function resolvePluginClassSourcePath(plugin){const className=plugin.android.className.split(".").pop();const candidateNames=new Set([`${className}.kt`,`${className}.java`]);const candidates=walkFiles(plugin.android.sourceDir,name=>candidateNames.has(name));if(candidates.length>1){throw new Error(`Declared class '${plugin.android.className}' for selected plugin '${plugin.id}' resolved to multiple source files under ${plugin.android.sourceDir}`);}return candidates[0]||null;}function validateSelectedPluginSources(plugins){for(const plugin of plugins){if(!plugin.android){throw new Error(`Android config missing for selected plugin '${plugin.id}'`);}if(!isDir(plugin.android.sourceDir)){throw new Error(`Android source directory missing for selected plugin '${plugin.id}'`);}const codeFiles=walkFiles(plugin.android.sourceDir,name=>name.endsWith(".kt")||name.endsWith(".java"));if(codeFiles.length===0){throw new Error(`No Android source files found for selected plugin '${plugin.id}'`);}if(!resolvePluginClassSourcePath(plugin)){throw new Error(`Declared class '${plugin.android.className}' for selected plugin '${plugin.id}' was not found as a .kt or .java file under ${plugin.android.sourceDir}`);}}}function copyTree(sourceDir,targetDir){if(!isDir(sourceDir)){return;}ensureDir(targetDir);for(const filePath of walkFiles(sourceDir,()=>true)){const targetPath=path.join(targetDir,path.relative(sourceDir,filePath));ensureDir(path.dirname(targetPath));fs.copyFileSync(filePath,targetPath);}}function copyAndroidPluginSources(plugins,javaRoot,log){const internalRoot=path.join(javaRoot,...PLUGINS_PACKAGE_PARTS,"internal");fs.rmSync(internalRoot,{recursive:true,force:true});ensureDir(internalRoot);let copiedCount=0;for(const plugin of plugins){const pluginOutputDir=path.join(internalRoot,sanitizeForPath(plugin.id));const codeFiles=walkFiles(plugin.android.sourceDir,name=>name.endsWith(".kt")||name.endsWith(".java"));for(const sourcePath of codeFiles){const targetPath=path.join(pluginOutputDir,path.relative(plugin.android.sourceDir,sourcePath));ensureDir(path.dirname(targetPath));fs.copyFileSync(sourcePath,targetPath);copiedCount++;}}log(`Copied ${copiedCount} Android plugin source file(s)`,"info");}function copyPluginAssets(plugins,androidProjectPath,log){const baseAssetsDir=path.join(androidProjectPath,"app","src","main","assets","plugins");fs.rmSync(baseAssetsDir,{recursive:true,force:true});ensureDir(baseAssetsDir);for(const plugin of plugins){const pluginAssetsDir=path.join(baseAssetsDir,sanitizeForPath(plugin.id));copyTree(path.join(plugin.pluginDir,"assets","common"),path.join(pluginAssetsDir,"common"));copyTree(path.join(plugin.pluginDir,"assets","android"),path.join(pluginAssetsDir,"android"));}log("Plugin assets copied to app/src/main/assets/plugins","info");}function formatKotlinMap(entries,emptyLiteral="emptyMap()"){return entries.length===0?emptyLiteral:`mapOf(\n${entries.join(",\n")}\n    )`;}function generatePluginRegistryFiles(plugins,javaRoot){const pluginIdToClassName={};const pluginToCommands={};for(const plugin of plugins){pluginIdToClassName[plugin.id]=plugin.android.className;pluginToCommands[plugin.id]=asUniqueSorted(plugin.commands);}const classEntries=Object.keys(pluginIdToClassName).sort().map(pluginId=>`        ${JSON.stringify(pluginId)} to ${JSON.stringify(pluginIdToClassName[pluginId])}`);const commandEntries=Object.keys(pluginToCommands).sort().map(pluginId=>{const commands=pluginToCommands[pluginId];const commandSet=commands.length?`setOf(${commands.map(value=>JSON.stringify(value)).join(", ")})`:"emptySet()";return`        ${JSON.stringify(pluginId)} to ${commandSet}`;});const indexContent=`package io.yourname.androidproject.plugins
+
+object GeneratedPluginIndex {
+    val pluginIdToClassName: Map<String, String> = ${formatKotlinMap(classEntries)}
+    val pluginToCommands: Map<String, Set<String>> = ${formatKotlinMap(commandEntries)}
+}
+`;const pluginsDir=path.join(javaRoot,...PLUGINS_PACKAGE_PARTS);ensureDir(pluginsDir);fs.writeFileSync(path.join(pluginsDir,"GeneratedPluginIndex.kt"),indexContent);fs.rmSync(path.join(pluginsDir,"GeneratedPluginMeta.kt"),{force:true});}function escapeRegexLiteral(value){return value.replace(/[.*+?^${}()|[\]\\]/g,"\\$&");}function updateAndroidManifestPermissions(manifestPath,selectedPermissions,allKnownPluginPermissions){const uniquePermissions=asUniqueSorted(selectedPermissions);const knownPermissions=asUniqueSorted(allKnownPluginPermissions);let manifest=fs.readFileSync(manifestPath,"utf8");const beginMarker="<!-- CATALYST_PLUGIN_PERMISSIONS_START -->";const endMarker="<!-- CATALYST_PLUGIN_PERMISSIONS_END -->";const markerRegex=/[ \t]*<!-- CATALYST_PLUGIN_PERMISSIONS_START -->[\s\S]*?<!-- CATALYST_PLUGIN_PERMISSIONS_END -->\s*/g;manifest=manifest.replace(markerRegex,"");// Migration cleanup for legacy entries previously written without markers.
+for(const permission of knownPermissions){const escaped=escapeRegexLiteral(permission);const legacyRegex=new RegExp(`^[ \\t]*<uses-permission\\s+android:name="${escaped}"\\s*/>\\s*\\n?`,"gm");manifest=manifest.replace(legacyRegex,"");}if(uniquePermissions.length>0){const permissionLines=uniquePermissions.map(permission=>`    <uses-permission android:name="${permission}" />`).join("\n");const managedBlock=`    ${beginMarker}\n${permissionLines}\n    ${endMarker}\n`;manifest=manifest.replace(/<application\b/,`${managedBlock}    <application`);}fs.writeFileSync(manifestPath,manifest);}function findDependenciesBlockRange(gradleText,gradlePath){const headerMatch=gradleText.match(/^dependencies\s*\{/m);if(!headerMatch||headerMatch.index==null){throw new Error(`Could not find dependencies block in ${gradlePath}`);}const openBraceIndex=gradleText.indexOf("{",headerMatch.index);if(openBraceIndex===-1){throw new Error(`Malformed dependencies block in ${gradlePath}`);}let depth=0;for(let index=openBraceIndex;index<gradleText.length;index++){const ch=gradleText[index];if(ch==="{")depth++;if(ch==="}")depth--;if(depth===0){return{openBraceIndex,blockEnd:index};}}throw new Error(`Could not find end of dependencies block in ${gradlePath}`);}function updateGradleDependencies(gradlePath,selectedDependencies,allKnownPluginDependencies){const uniqueDependencies=asUniqueSorted(selectedDependencies);const knownDependencies=asUniqueSorted(allKnownPluginDependencies);let gradle=fs.readFileSync(gradlePath,"utf8");const{openBraceIndex,blockEnd}=findDependenciesBlockRange(gradle,gradlePath);let blockBody=gradle.slice(openBraceIndex+1,blockEnd);const beginMarker="// CATALYST_PLUGIN_DEPENDENCIES_START";const endMarker="// CATALYST_PLUGIN_DEPENDENCIES_END";const markerRegex=/[ \t]*\/\/ CATALYST_PLUGIN_DEPENDENCIES_START[\s\S]*?\/\/ CATALYST_PLUGIN_DEPENDENCIES_END\s*/g;blockBody=blockBody.replace(markerRegex,"");// Migration cleanup for legacy entries previously written without markers.
+for(const dependency of knownDependencies){const escaped=escapeRegexLiteral(dependency);const legacyRegex=new RegExp(`^[ \\t]*implementation\\("${escaped}"\\)\\s*\\n?`,"gm");blockBody=blockBody.replace(legacyRegex,"");}if(uniqueDependencies.length>0){const managedLines=uniqueDependencies.map(dependency=>`    implementation("${dependency}")`).join("\n");blockBody=`${blockBody}\n    ${beginMarker}\n${managedLines}\n    ${endMarker}\n`;}gradle=`${gradle.slice(0,openBraceIndex+1)}${blockBody}${gradle.slice(blockEnd)}`;fs.writeFileSync(gradlePath,gradle);}function updateProguardKeepRules(proguardPath,selectedClassNames,allKnownPluginClassNames){const uniqueClassNames=asUniqueSorted(selectedClassNames);const knownClassNames=asUniqueSorted(allKnownPluginClassNames);let rules=fs.readFileSync(proguardPath,"utf8");const beginMarker="# CATALYST_PLUGIN_KEEP_START";const endMarker="# CATALYST_PLUGIN_KEEP_END";const markerRegex=/[ \t]*# CATALYST_PLUGIN_KEEP_START[\s\S]*?# CATALYST_PLUGIN_KEEP_END\s*/g;rules=rules.replace(markerRegex,"");for(const className of knownClassNames){const escaped=escapeRegexLiteral(className);const legacyRegex=new RegExp(`^[ \\t]*-keep class ${escaped} \\{ \\*; \\}\\s*\\n?`,"gm");rules=rules.replace(legacyRegex,"");}if(uniqueClassNames.length>0){const keepLines=uniqueClassNames.map(className=>`-keep class ${className} { *; }`).join("\n");rules=`${rules.trimEnd()}\n\n${beginMarker}\n${keepLines}\n${endMarker}\n`;}fs.writeFileSync(proguardPath,rules);}function composeAndroidPlugins({corePluginsRoot,androidProjectPath,pluginConfig,log}){const discovered=discoverInternalPlugins(corePluginsRoot,log);validatePlugins(discovered);const enabled=selectPluginsByConfig(discovered,pluginConfig,log);const selected=selectPluginsForPlatform(enabled,"android",log);validateSelectedPluginSources(selected);const javaRoot=path.join(androidProjectPath,"app","src","main","java");const manifestPath=path.join(androidProjectPath,"app","src","main","AndroidManifest.xml");const gradlePath=path.join(androidProjectPath,"app","build.gradle.kts");const proguardPath=path.join(androidProjectPath,"app","proguard-rules.pro");copyAndroidPluginSources(selected,javaRoot,log);copyPluginAssets(selected,androidProjectPath,log);generatePluginRegistryFiles(selected,javaRoot);updateAndroidManifestPermissions(manifestPath,selected.flatMap(plugin=>plugin.android.permissions),discovered.flatMap(plugin=>plugin.android?.permissions||[]));updateGradleDependencies(gradlePath,selected.flatMap(plugin=>plugin.android.dependencies),discovered.flatMap(plugin=>plugin.android?.dependencies||[]));updateProguardKeepRules(proguardPath,selected.map(plugin=>plugin.android?.className).filter(Boolean),discovered.map(plugin=>plugin.android?.className).filter(Boolean));log(`Plugin composition complete (${selected.length} enabled plugin(s))`,"success");return{pluginCount:selected.length,commandCount:selected.reduce((total,plugin)=>total+plugin.commands.length,0)};}module.exports={composeAndroidPlugins};