catalyst-core-internal 0.1.2 → 0.1.3

package/dist/native/iosnativeWebView/Sources/Core/Plugins/PluginBridge.swift

@@ -0,0 +1,364 @@
+import Foundation
+import WebKit
+import UIKit
+import os
+
+private let pluginBridgeLogger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "com.app", category: "PluginBridge")
+
+private struct PluginBridgeValidationError: LocalizedError {
+    let message: String
+    let code: String
+
+    var errorDescription: String? {
+        message
+    }
+}
+
+private struct PluginRequest {
+    let pluginId: String
+    let command: String
+    let data: Any?
+    let requestId: String?
+}
+
+protocol PluginBridgeMessage {
+    var name: String { get }
+    var body: Any { get }
+}
+
+extension WKScriptMessage: PluginBridgeMessage {}
+
+final class PluginBridge: NSObject {
+    private weak var webView: WKWebView?
+    private weak var viewController: UIViewController?
+    private var messageHandlerProxy: WeakScriptMessageHandler?
+    private var isRegistered = false
+
+    private let pluginFactories = GeneratedPluginIndex.pluginFactories
+    private let pluginToCommands = GeneratedPluginIndex.pluginToCommands
+
+    private let bridgeName = "PluginBridge"
+    private let errorEvent = "PLUGIN_BRIDGE_ERROR"
+    private let systemPluginId = "__bridge__"
+
+    init(webView: WKWebView, viewController: UIViewController) {
+        self.webView = webView
+        self.viewController = viewController
+        super.init()
+    }
+
+    func register() {
+        guard !isRegistered else { return }
+        guard let userContentController = webView?.configuration.userContentController else {
+            return
+        }
+        let proxy = WeakScriptMessageHandler(delegate: self)
+        userContentController.add(proxy, name: bridgeName)
+        messageHandlerProxy = proxy
+        isRegistered = true
+    }
+
+    func unregister() {
+        guard isRegistered else { return }
+        webView?.configuration.userContentController.removeScriptMessageHandler(forName: bridgeName)
+        messageHandlerProxy = nil
+        isRegistered = false
+    }
+
+    deinit {
+        unregister()
+    }
+
+    private func parseRequest(_ message: PluginBridgeMessage) throws -> PluginRequest {
+        guard message.name == bridgeName else {
+            throw PluginBridgeValidationError(message: "Invalid message handler", code: "INVALID_PAYLOAD")
+        }
+
+        let body: [String: Any]
+        if let dictionary = message.body as? [String: Any] {
+            body = dictionary
+        } else if let dictionary = message.body as? NSDictionary,
+                  let castedBody = dictionary as? [String: Any] {
+            body = castedBody
+        } else {
+            throw PluginBridgeValidationError(message: "Payload must be an object", code: "INVALID_PAYLOAD")
+        }
+
+        guard JSONSerialization.isValidJSONObject(body) else {
+            throw PluginBridgeValidationError(message: "Payload must be JSON-serializable", code: "INVALID_PAYLOAD")
+        }
+
+        let payloadData: Data
+        do {
+            payloadData = try JSONSerialization.data(withJSONObject: body)
+        } catch {
+            throw PluginBridgeValidationError(message: "Invalid payload", code: "INVALID_PAYLOAD")
+        }
+
+        if payloadData.count > CatalystConstants.Bridge.maxMessageSize {
+            throw PluginBridgeValidationError(message: "Payload exceeds maximum size", code: "INVALID_PAYLOAD")
+        }
+
+        let pluginId = (body["pluginId"] as? String ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        let command = (body["command"] as? String ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        let requestId = (body["requestId"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
+
+        return PluginRequest(
+            pluginId: pluginId,
+            command: command,
+            data: body["data"],
+            requestId: requestId?.isEmpty == true ? nil : requestId
+        )
+    }
+
+    private func hasPlugin(_ pluginId: String) -> Bool {
+        pluginFactories[pluginId] != nil
+    }
+
+    private func hasCommand(pluginId: String, command: String) -> Bool {
+        pluginToCommands[pluginId]?.contains(command) ?? false
+    }
+
+    private func sendBridgeError(message: String, code: String, request: PluginRequest?) {
+        let bridge = PluginBridgeContext(
+            webView: webView,
+            viewController: viewController,
+            pluginId: systemPluginId,
+            command: request?.command,
+            requestId: request?.requestId
+        )
+        var payload: [String: Any] = [
+            "message": message,
+            "code": code,
+            "pluginId": request?.pluginId ?? systemPluginId,
+        ]
+        if let command = request?.command, !command.isEmpty {
+            payload["command"] = command
+        }
+        bridge.callback(eventName: errorEvent, data: payload)
+    }
+
+    func handleMessage(_ message: PluginBridgeMessage) {
+        var request: PluginRequest?
+
+        do {
+            let parsedRequest = try parseRequest(message)
+            request = parsedRequest
+
+            if parsedRequest.pluginId.isEmpty {
+                sendBridgeError(message: "pluginId is required", code: "INVALID_PAYLOAD", request: parsedRequest)
+                return
+            }
+            if parsedRequest.command.isEmpty {
+                sendBridgeError(message: "command is required", code: "INVALID_PAYLOAD", request: parsedRequest)
+                return
+            }
+
+            if !hasPlugin(parsedRequest.pluginId) {
+                sendBridgeError(
+                    message: "Unsupported plugin: \(parsedRequest.pluginId)",
+                    code: "PLUGIN_NOT_FOUND",
+                    request: parsedRequest
+                )
+                return
+            }
+
+            if !hasCommand(pluginId: parsedRequest.pluginId, command: parsedRequest.command) {
+                sendBridgeError(
+                    message: "Unsupported command '\(parsedRequest.command)' for plugin '\(parsedRequest.pluginId)'",
+                    code: "COMMAND_NOT_SUPPORTED",
+                    request: parsedRequest
+                )
+                return
+            }
+
+            guard let factory = pluginFactories[parsedRequest.pluginId] else {
+                sendBridgeError(
+                    message: "No plugin registered for id: \(parsedRequest.pluginId)",
+                    code: "PLUGIN_NOT_REGISTERED",
+                    request: parsedRequest
+                )
+                return
+            }
+
+            let plugin = factory()
+            let bridge = PluginBridgeContext(
+                webView: webView,
+                viewController: viewController,
+                pluginId: parsedRequest.pluginId,
+                command: parsedRequest.command,
+                requestId: parsedRequest.requestId
+            )
+            plugin.handle(command: parsedRequest.command, data: parsedRequest.data, bridge: bridge)
+        } catch let error as PluginBridgeValidationError {
+            sendBridgeError(message: error.message, code: error.code, request: request)
+        } catch {
+            pluginBridgeLogger.error("Plugin command failed: \(error.localizedDescription)")
+            sendBridgeError(
+                message: "Plugin execution failed: \(error.localizedDescription)",
+                code: "PLUGIN_EXECUTION_FAILED",
+                request: request
+            )
+        }
+    }
+}
+
+extension PluginBridge: WKScriptMessageHandler {
+    func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
+        handleMessage(message)
+    }
+}
+
+final class PluginBridgeContext {
+    weak var webView: WKWebView?
+    weak var viewController: UIViewController?
+
+    private let systemPluginId = "__bridge__"
+    private let bridgeErrorEvent = "PLUGIN_BRIDGE_ERROR"
+
+    let pluginId: String
+    let command: String?
+    let requestId: String?
+
+    init(
+        webView: WKWebView?,
+        viewController: UIViewController?,
+        pluginId: String,
+        command: String?,
+        requestId: String?
+    ) {
+        self.webView = webView
+        self.viewController = viewController
+        self.pluginId = pluginId
+        self.command = command
+        self.requestId = requestId
+    }
+
+    func callback(
+        eventName: String,
+        data: Any?,
+        command: String? = nil
+    ) {
+        let resolvedRequestId = self.requestId
+        let resolvedCommand = command ?? self.command
+        let trimmedEventName = eventName.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmedEventName.isEmpty else {
+            emitBridgeError(
+                message: "Rejected callback with blank event name for plugin \(self.pluginId)",
+                code: "INVALID_CALLBACK",
+                requestId: resolvedRequestId,
+                command: resolvedCommand
+            )
+            return
+        }
+        if !dispatchEnvelope(
+            pluginId: pluginId,
+            eventName: trimmedEventName,
+            payload: data,
+            requestId: resolvedRequestId,
+            command: resolvedCommand
+        ) {
+            if pluginId == systemPluginId && trimmedEventName == bridgeErrorEvent {
+                pluginBridgeLogger.error("Failed to dispatch bridge error event for plugin \(self.pluginId)")
+                return
+            }
+
+            emitBridgeError(
+                message: "Failed to dispatch callback \(trimmedEventName) for plugin \(self.pluginId)",
+                code: "PLUGIN_EXECUTION_FAILED",
+                requestId: resolvedRequestId,
+                command: resolvedCommand
+            )
+        }
+    }
+
+    private func emitBridgeError(
+        message: String,
+        code: String,
+        requestId: String?,
+        command: String?
+    ) {
+        var payload: [String: Any] = [
+            "message": message,
+            "code": code,
+            "pluginId": pluginId,
+        ]
+
+        if let command = command, !command.isEmpty {
+            payload["command"] = command
+        }
+
+        if !dispatchEnvelope(
+            pluginId: systemPluginId,
+            eventName: bridgeErrorEvent,
+            payload: payload,
+            requestId: requestId,
+            command: command,
+            logFailures: false
+        ) {
+            pluginBridgeLogger.error("Failed to dispatch bridge error for plugin \(self.pluginId): \(message)")
+        }
+    }
+
+    private func dispatchEnvelope(
+        pluginId: String,
+        eventName: String,
+        payload: Any?,
+        requestId: String?,
+        command: String?,
+        logFailures: Bool = true
+    ) -> Bool {
+        guard let webView = webView else {
+            if logFailures {
+                pluginBridgeLogger.error("WebView unavailable for plugin callback \(eventName)")
+            }
+            return false
+        }
+
+        let envelope: [String: Any] = [
+            "pluginId": pluginId,
+            "eventName": eventName,
+            "payload": payload ?? NSNull(),
+            "requestId": requestId ?? NSNull(),
+            "command": command ?? NSNull(),
+        ]
+
+        guard JSONSerialization.isValidJSONObject(envelope),
+              let envelopeData = try? JSONSerialization.data(withJSONObject: envelope),
+              let envelopeJson = String(data: envelopeData, encoding: .utf8) else {
+            if logFailures {
+                pluginBridgeLogger.error("Failed to serialize plugin callback envelope for \(pluginId).\(eventName)")
+            }
+            return false
+        }
+
+        let envelopeLiteral = javaScriptStringLiteral(envelopeJson)
+        let script = "window.PluginBridgeWeb && window.PluginBridgeWeb.dispatch(\(envelopeLiteral));"
+
+        DispatchQueue.main.async {
+            webView.evaluateJavaScript(
+                script,
+                completionHandler: { _, error in
+                    if let error = error {
+                        pluginBridgeLogger.error(
+                            "Plugin callback JS failed for \(pluginId).\(eventName): \(error.localizedDescription)"
+                        )
+                    }
+                }
+            )
+        }
+
+        return true
+    }
+
+    private func javaScriptStringLiteral(_ value: String) -> String {
+        let escaped = value
+            .replacingOccurrences(of: "\\", with: "\\\\")
+            .replacingOccurrences(of: "\"", with: "\\\"")
+            .replacingOccurrences(of: "\n", with: "\\n")
+            .replacingOccurrences(of: "\r", with: "\\r")
+            .replacingOccurrences(of: "\u{2028}", with: "\\u2028")
+            .replacingOccurrences(of: "\u{2029}", with: "\\u2029")
+        return "\"\(escaped)\""
+    }
+}

package/dist/native/iosnativeWebView/Sources/Core/Utils/CacheManager.swift

@@ -265,9 +265,20 @@ public final class CacheManager {
     }
     
     func getCacheStatistics() -> (memoryUsed: Int, diskUsed: Int) {
-        // URLCache methods are thread-safe, no need for sync queue
         let memoryUsed = session.configuration.urlCache?.currentMemoryUsage ?? 0
-        let diskUsed = session.configuration.urlCache?.currentDiskUsage ?? 0
+
+        // Sum size of all custom .cache files written to disk (separate from URLCache internals)
+        var diskUsed = 0
+        if let files = try? FileManager.default.contentsOfDirectory(
+            at: cacheDirectory,
+            includingPropertiesForKeys: [.fileSizeKey]
+        ) {
+            diskUsed = files.reduce(0) { total, url in
+                let size = (try? url.resourceValues(forKeys: [.fileSizeKey]))?.fileSize ?? 0
+                return total + size
+            }
+        }
+
         return (memoryUsed, diskUsed)
     }
 }

package/dist/native/iosnativeWebView/Sources/Core/WebView/NativeBridge.swift

@@ -17,6 +17,8 @@ class NativeBridge: NSObject, BridgeCommandHandlerDelegate, BridgeFileHandlerDel
     weak var webView: WKWebView?
     private weak var viewController: UIViewController?
     private weak var webViewModel: WebViewModel?
+    private var messageHandlerProxy: WeakScriptMessageHandler?
+    private var isRegistered = false
 
     // Protocol-based notification handler (injected at runtime)
     private var notificationHandler: NotificationHandlerProtocol = NullNotificationHandler.shared
@@ -133,10 +135,16 @@ class NativeBridge: NSObject, BridgeCommandHandlerDelegate, BridgeFileHandlerDel
 
     // Register the JavaScript interface with the WebView
     func register() {
+        guard !isRegistered else { return }
         let registerStart = CFAbsoluteTimeGetCurrent()
 
-        let userContentController = webView?.configuration.userContentController
-        userContentController?.add(self, name: "NativeBridge")
+        guard let userContentController = webView?.configuration.userContentController else {
+            return
+        }
+        let proxy = WeakScriptMessageHandler(delegate: self)
+        userContentController.add(proxy, name: "NativeBridge")
+        messageHandlerProxy = proxy
+        isRegistered = true
 
         let registerTime = (CFAbsoluteTimeGetCurrent() - registerStart) * 1000
         logWithTimestamp("✅ NativeBridge registered (took \(String(format: "%.2f", registerTime))ms)")
@@ -144,7 +152,10 @@ class NativeBridge: NSObject, BridgeCommandHandlerDelegate, BridgeFileHandlerDel
     
     // Unregister to prevent memory leaks
     func unregister() {
+        guard isRegistered else { return }
         webView?.configuration.userContentController.removeScriptMessageHandler(forName: "NativeBridge")
+        messageHandlerProxy = nil
+        isRegistered = false
         
         if let listenerId = networkStatusListenerId {
             NetworkMonitor.shared.removeListener(listenerId)

package/dist/native/iosnativeWebView/Sources/Core/WebView/WeakScriptMessageHandler.swift

@@ -0,0 +1,14 @@
+import WebKit
+
+final class WeakScriptMessageHandler: NSObject, WKScriptMessageHandler {
+    weak var delegate: WKScriptMessageHandler?
+
+    init(delegate: WKScriptMessageHandler) {
+        self.delegate = delegate
+        super.init()
+    }
+
+    func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
+        delegate?.userContentController(userContentController, didReceive: message)
+    }
+}

package/dist/native/iosnativeWebView/Sources/Core/WebView/WebView.swift

@@ -121,6 +121,8 @@ public struct WebView: UIViewRepresentable, Equatable {
         // Clean up native bridge
         coordinator.nativeBridge?.unregister()
         coordinator.nativeBridge = nil
+        coordinator.pluginBridge?.unregister()
+        coordinator.pluginBridge = nil
         coordinator.hostingController = nil
 
         // Unregister custom URL protocol
@@ -132,6 +134,7 @@ public struct WebView: UIViewRepresentable, Equatable {
     public class Coordinator: NSObject {
         var parent: WebView
         var nativeBridge: NativeBridge?
+        var pluginBridge: PluginBridge?
         var hostingController: UIViewController?
         var isObserverAdded = false
 
@@ -146,6 +149,7 @@ public struct WebView: UIViewRepresentable, Equatable {
 
             // Create and register the native bridge
             let bridge = NativeBridge(webView: webView, viewController: hostingController)
+            let pluginBridge = PluginBridge(webView: webView, viewController: hostingController)
 
             // Inject WebViewModel for safe area handling
             Task { @MainActor in
@@ -156,7 +160,9 @@ public struct WebView: UIViewRepresentable, Equatable {
             bridge.setNotificationHandler(NotificationHandlerProvider.shared)
 
             bridge.register()
+            pluginBridge.register()
             self.nativeBridge = bridge
+            self.pluginBridge = pluginBridge
         }
         
         override public func observeValue(forKeyPath keyPath: String?,

package/dist/native/iosnativeWebView/iosnativeWebView.xcodeproj/project.pbxproj

@@ -23,6 +23,7 @@
 		E9F699E02EE065B0005E972E /* NotificationHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F699DF2EE065B0005E972E /* NotificationHandlerTests.swift */; };
 		E9F699E22EE06650005E972E /* FrameworkServerUtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F699E12EE06650005E972E /* FrameworkServerUtilsTests.swift */; };
 		E9F699E42EE0696A005E972E /* BootTimingUtilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9F699E32EE0696A005E972E /* BootTimingUtilityTests.swift */; };
+		F2B100012F11111100AAA001 /* PluginBridgeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2B100022F11111100AAA001 /* PluginBridgeTests.swift */; };
 		F1234AC22E990180008C7F58 /* localhost.p12 in Resources */ = {isa = PBXBuildFile; fileRef = F1234AC32E990180008C7F58 /* localhost.p12 */; };
 /* End PBXBuildFile section */
 
@@ -66,6 +67,7 @@
 		E9F699DF2EE065B0005E972E /* NotificationHandlerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationHandlerTests.swift; sourceTree = "<group>"; };
 		E9F699E12EE06650005E972E /* FrameworkServerUtilsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkServerUtilsTests.swift; sourceTree = "<group>"; };
 		E9F699E32EE0696A005E972E /* BootTimingUtilityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BootTimingUtilityTests.swift; sourceTree = "<group>"; };
+		F2B100022F11111100AAA001 /* PluginBridgeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluginBridgeTests.swift; sourceTree = "<group>"; };
 		F1234AC32E990180008C7F58 /* localhost.p12 */ = {isa = PBXFileReference; lastKnownFileType = file; path = localhost.p12; sourceTree = "<group>"; };
 		XCCONFIG001000000001 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
 		XCCONFIG001000000002 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
@@ -152,6 +154,7 @@
 				E9F699DB2EE06482005E972E /* CacheManagerTests.swift */,
 				E9F699D92EE063D5005E972E /* WebViewTests.swift */,
 				E9F699D72EE06068005E972E /* NativeBridgeTests.swift */,
+				F2B100022F11111100AAA001 /* PluginBridgeTests.swift */,
 				E9F699D52EE05D74005E972E /* BridgeMessageValidatorTests.swift */,
 				E9F699D32EE05984005E972E /* ConfigMappingTests.swift */,
 				E9F699D02EDEFEF2005E972E /* URLWhitelistManagerTests.swift */,
@@ -321,6 +324,7 @@
 				E9F699DC2EE06483005E972E /* CacheManagerTests.swift in Sources */,
 				E9F699D42EE05984005E972E /* ConfigMappingTests.swift in Sources */,
 				E9F699D82EE06068005E972E /* NativeBridgeTests.swift in Sources */,
+				F2B100012F11111100AAA001 /* PluginBridgeTests.swift in Sources */,
 				E9F699DA2EE063D5005E972E /* WebViewTests.swift in Sources */,
 				E9F699E42EE0696A005E972E /* BootTimingUtilityTests.swift in Sources */,
 				E9F699E22EE06650005E972E /* FrameworkServerUtilsTests.swift in Sources */,

package/dist/native/iosnativeWebView/iosnativeWebView.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,6 +1,42 @@
 {
   "originHash" : "3d4b03cf830e06eaa66e0727fd91253b9df9d2675cbe24eb099df0d4bb4d1f01",
   "pins" : [
+    {
+      "identity" : "appauth-ios",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/openid/AppAuth-iOS.git",
+      "state" : {
+        "revision" : "2781038865a80e2c425a1da12cc1327bcd56501f",
+        "version" : "1.7.6"
+      }
+    },
+    {
+      "identity" : "googlesignin-ios",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleSignIn-iOS",
+      "state" : {
+        "revision" : "a7965d134c5d3567026c523e0a8a583f73b62b0d",
+        "version" : "7.1.0"
+      }
+    },
+    {
+      "identity" : "gtm-session-fetcher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/gtm-session-fetcher.git",
+      "state" : {
+        "revision" : "a2ab612cb980066ee56d90d60d8462992c07f24b",
+        "version" : "3.5.0"
+      }
+    },
+    {
+      "identity" : "gtmappauth",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GTMAppAuth.git",
+      "state" : {
+        "revision" : "5d7d66f647400952b1758b230e019b07c0b4b22a",
+        "version" : "4.1.1"
+      }
+    },
     {
       "identity" : "jsonschema.swift",
       "kind" : "remoteSourceControl",

package/dist/native/iosnativeWebView/iosnativeWebView.xctestplan

@@ -9,6 +9,7 @@
     }
   ],
   "defaultOptions" : {
+    "codeCoverage" : true,
     "commandLineArgumentEntries" : [
       {
         "argument" : "-OSLogEnable"