Simplify

Author: vince-hz

Sources/NTLBridge/JSInboundMessage.swift

@@ -4,24 +4,24 @@ import Foundation
 public typealias JSMethodHandler = (JSONValue) throws -> JSONValue?
 
 /// JavaScript异步方法处理器类型别名
-public typealias JSAsyncMethodHandler = (JSONValue, @escaping (Result<JSONValue?, Error>) -> Void) -> Void
+public typealias JSAsyncMethodHandler = (JSONValue, @escaping (Result<JSONValue?, Error>) -> Void) throws -> Void
 
 /// JavaScript方法处理器存储结构
-internal struct JSMethodHandlerContainer {
+struct JSMethodHandlerContainer {
     let handler: JSMethodHandler
     let asyncHandler: JSAsyncMethodHandler?
     weak var target: AnyObject?
     private let hasTarget: Bool
     let isAsync: Bool
-    
+
     init(handler: @escaping JSMethodHandler, target: AnyObject? = nil) {
         self.handler = handler
         self.asyncHandler = nil
         self.target = target
         self.hasTarget = target != nil
         self.isAsync = false
     }
-    
+
     /// 每次调用只能回调一次。
     init(asyncHandler: @escaping JSAsyncMethodHandler, target: AnyObject? = nil) {
         self.handler = { _ in throw NSError(domain: "NTLBridge", code: -1, userInfo: [NSLocalizedDescriptionKey: "Async handler used in sync context"]) }
@@ -30,11 +30,11 @@ internal struct JSMethodHandlerContainer {
         self.hasTarget = target != nil
         self.isAsync = true
     }
-    
+
     /// 检查目标对象是否仍然有效（对于实例方法）
     var isValid: Bool {
         // 如果初始化时没有目标对象（静态方法），始终有效
         // 如果有目标对象，检查弱引用是否仍然指向有效对象
         hasTarget ? target != nil : true
     }
-}
+}

Sources/NTLBridge/JSMethodHandlerContainer.swift

@@ -1,5 +1,20 @@
 import Foundation
 
+func jsStructuredError(jsonValue: JSONValue) -> NSError? {
+    guard case let .dictionary(dictionary) = jsonValue,
+          let name = dictionary["name"]?.stringValue,
+          let message = dictionary["message"]?.stringValue,
+          let stack = dictionary["stack"]?.stringValue
+    else {
+        return nil
+    }
+    let description = "name: \(name)\nmessage: \(message)\nstack: \(stack)"
+    let userInfo: [String: Any] = [
+        NSLocalizedDescriptionKey: description,
+    ]
+    return NSError(domain: "NTLBridge", code: -1, userInfo: userInfo)
+}
+
 /// Bridge错误类型
 public enum NTLBridgeError: Error, LocalizedError {
     case invalidValue
@@ -9,15 +24,14 @@ public enum NTLBridgeError: Error, LocalizedError {
         switch self {
         case .invalidValue:
             return "Invalid value for conversion"
-        case .typeConversionFailed(let error):
+        case let .typeConversionFailed(error):
             return "Type conversion failed: \(error.localizedDescription)"
         }
     }
 }
 
 /// Bridge工具类，提供JSON序列化/反序列化功能
-public final class NTLBridgeUtil {
-    
+public enum NTLBridgeUtil {
     // MARK: - JSON Encoder/Decoder
 
     /// 创建JSONEncoder实例，可被子类重写
@@ -76,46 +90,8 @@ public final class NTLBridgeUtil {
         return JSONValue(any: any) ?? .null
     }
 
-    /// 将JSONValue转换为Any类型
-    /// - Parameter value: 要转换的JSONValue
-    /// - Returns: 转换后的Any值
-    public static func anyValue(from value: JSONValue) -> Any? {
-        return value.rawValue
-    }
-    
-    // MARK: - Array Conversion
-    
-    /// 将参数数组转换为JSONValue数组
-    /// - Parameter args: 参数数组
-    /// - Returns: JSONValue数组
-    public static func jsonArguments(from args: [Any?]) -> [JSONValue] {
-        return args.map { jsonValue(from: $0) }
-    }
-    
-    /// 将JSONValue数组转换为Any数组
-    /// - Parameter values: JSONValue数组
-    /// - Returns: Any数组
-    public static func anyArguments(from values: [JSONValue]) -> [Any?] {
-        return values.map { anyValue(from: $0) }
-    }
-    
     // MARK: - Message Parsing
 
-    /// 解析来自JavaScript的消息
-    /// - Parameter message: 消息字符串
-    /// - Returns: 解析后的JSInboundMessage，解析失败返回nil
-    public static func parseInboundMessage(_ message: String) -> JSInboundMessage? {
-        guard let data = message.data(using: .utf8) else {
-            return nil
-        }
-        
-        do {
-            return try decoder.decode(JSInboundMessage.self, from: data)
-        } catch {
-            return nil
-        }
-    }
-    
     /// 编码发往JavaScript的调用信息
     /// - Parameter callInfo: 调用信息
     /// - Returns: 编码后的JSON字符串，编码失败返回nil
@@ -130,20 +106,6 @@ public final class NTLBridgeUtil {
 
     // MARK: - Type Conversion
 
-    /// 将JSONValue转换为指定类型
-    /// - Parameter value: 要转换的JSONValue
-    /// - Returns: 转换后的指定类型，转换失败返回nil
-    public static func convertValue<T: Decodable>(_ value: JSONValue?) -> T? {
-        guard let value = value else { return nil }
-        
-        do {
-            let data = try encoder.encode(value)
-            return try decoder.decode(T.self, from: data)
-        } catch {
-            return nil
-        }
-    }
-    
     /// 将JSONValue转换为指定类型，抛出错误
     /// - Parameter value: 要转换的JSONValue
     /// - Returns: 转换后的指定类型
@@ -165,8 +127,8 @@ public final class NTLBridgeUtil {
     /// - Parameter methodName: 方法名
     /// - Returns: 是否有效
     public static func isValidMethodName(_ methodName: String) -> Bool {
-        return !methodName.isEmpty && 
-               !methodName.contains(" ") && 
-               !methodName.hasPrefix("_")
+        return !methodName.isEmpty &&
+            !methodName.contains(" ") &&
+            !methodName.hasPrefix("_")
     }
 }

Sources/NTLBridge/JSStructuredError.swift

@@ -1,8 +1,8 @@
 import Foundation
 
-extension NTLWebView {
+public extension NTLWebView {
     /// 调用 js bridge 方法，支持直接传入 Codable 参数数组
-    public func callHandler<T: Encodable>(
+    func callHandler<T: Encodable>(
         _ method: String,
         arguments: [T],
         completion: ((Result<JSONValue?, Error>) -> Void)? = nil
@@ -16,7 +16,7 @@ extension NTLWebView {
     }
 
     /// 调用 js bridge 方法（无参数版本）
-    public func callHandler(
+    func callHandler(
         _ method: String,
         completion: ((Result<JSONValue?, Error>) -> Void)? = nil
     ) {
@@ -29,7 +29,7 @@ extension NTLWebView {
     }
 
     /// 调用 js bridge 方法，支持直接传入任意类型参数数组
-    public func callHandler(
+    func callHandler(
         _ method: String,
         arguments: [Any],
         completion: ((Result<JSONValue?, Error>) -> Void)? = nil
@@ -43,7 +43,7 @@ extension NTLWebView {
     }
 
     /// 调用 js bridge 方法，支持直接传入 Codable 参数数组并返回指定类型
-    public func callTypedHandler<T: Encodable, U: Decodable>(
+    func callTypedHandler<T: Encodable, U: Decodable>(
         _ method: String,
         arguments: [T],
         expecting type: U.Type,
@@ -65,7 +65,7 @@ extension NTLWebView {
     }
 
     /// 调用 js bridge 方法并返回指定类型（无参数版本）
-    public func callTypedHandler<U: Decodable>(
+    func callTypedHandler<U: Decodable>(
         _ method: String,
         expecting type: U.Type,
         completion: @escaping (Result<U, Error>) -> Void