@devioarts/capacitor-mdns 0.0.3 → 0.2.0

package/ios/Sources/mDNSPlugin/mDNSPlugin.swift

@@ -1,5 +1,6 @@
 import Capacitor
 import Foundation
+import CoreFoundation
 
 /**
  * Capacitor bridge for the iOS mDNS plugin.
@@ -20,44 +21,68 @@ public class mDNSPlugin: CAPPlugin, CAPBridgedPlugin {
     public let identifier = "mDNSPlugin"
     public let jsName = "mDNS"
     public let pluginMethods: [CAPPluginMethod] = [
+        CAPPluginMethod(name: "getPluginPlatform", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "startBroadcast", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "stopBroadcast", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "discover", returnType: CAPPluginReturnPromise)
+        CAPPluginMethod(name: "discover", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "watchServices", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "stopWatching", returnType: CAPPluginReturnPromise)
     ]
 
     private let mdns = MDNS()
 
+    override public func load() {
+        super.load()
+        mdns.watchDelegate = self
+    }
+
     // MARK: - Helpers
 
     private func jnull(_ v: String?) -> Any {
         return v ?? NSNull()
     }
 
-    private func normalizeType(_ raw: String?) -> String {
-        var t = raw ?? "_http._tcp."
-        if t.last != "." { t += "." }
-        return t
+    private func stringOption(_ call: CAPPluginCall, _ key: String) throws -> String? {
+        guard let raw = call.options[key], !(raw is NSNull) else { return nil }
+        guard let value = raw as? String else { throw inputError("Invalid \(key)") }
+        return value
+    }
+    private func inputError(_ message: String) -> NSError {
+        NSError(domain: "mDNS", code: -1, userInfo: [NSLocalizedDescriptionKey: message])
+    }
+    private func numberOption(_ call: CAPPluginCall, _ key: String, fallback: Double) throws -> Double {
+        guard let raw = call.options[key], !(raw is NSNull) else { return fallback }
+        guard let value = raw as? NSNumber, CFGetTypeID(value) != CFBooleanGetTypeID(), value.doubleValue.isFinite else { throw inputError("Invalid \(key)") }
+        return value.doubleValue
     }
-
     // MARK: - API
 
+    /// getPluginPlatform()
+    @objc public func getPluginPlatform(_ call: CAPPluginCall) {
+        call.resolve([
+            "platform": "ios"
+        ])
+    }
+
     /// startBroadcast({ type?, name?, port, txt? })
     @objc public func startBroadcast(_ call: CAPPluginCall) {
-        let type = normalizeType(call.getString("type"))
-        let name = (call.getString("name")?.trimmingCharacters(in: .whitespacesAndNewlines)).flatMap { $0.isEmpty ? nil : $0 } ?? "DevIOArtsMDNS"
-        let port = call.getInt("port") ?? 0
-        let txt  = call.getObject("txt") as? [String: String]
-
-        guard port > 0 else {
-            call.resolve([
-                "publishing": false,
-                "name": "",
-                "error": true,
-                "errorMessage": "Missing/invalid port"
-            ])
+        let type: String, name: String, port: Int, txt: [String: String]?
+        do {
+            type = try MDNS.validatedType(stringOption(call, "type") ?? "")
+            name = try MDNS.validatedName(stringOption(call, "name") ?? "")
+            let number = try numberOption(call, "port", fallback: 0)
+            guard (1...65535).contains(number), number.rounded(.towardZero) == number else { throw inputError("Missing/invalid port") }
+            port = Int(number)
+            let raw = call.options["txt"]
+            if raw == nil || raw is NSNull { txt = nil } else {
+                guard let values = raw as? [String: String] else { throw inputError("TXT must be an object of strings") }
+                txt = values
+            }
+            try MDNS.validateTXT(txt)
+        } catch {
+            call.resolve(["publishing": mdns.isPublishing, "name": "", "error": true, "errorMessage": error.localizedDescription])
             return
         }
-
         mdns.broadcast(type: type, name: name, port: port, txt: txt) { result in
             switch result {
             case .success(let finalName):
@@ -98,11 +123,17 @@ public class mDNSPlugin: CAPPlugin, CAPBridgedPlugin {
 
     /// discover({ type?, name?, timeout? })
     @objc public func discover(_ call: CAPPluginCall) {
-        let type = normalizeType(call.getString("type"))
-        let targetName = call.getString("name")
-        let timeout = call.getInt("timeout") ?? 3000
+        let type: String, targetName: String?, timeout: Int
+        do {
+            type = try MDNS.validatedType(stringOption(call, "type") ?? "")
+            let name = try MDNS.validatedName(stringOption(call, "name") ?? "")
+            targetName = name.isEmpty ? nil : name
+            timeout = Int(min(2_147_483_647, max(0, try numberOption(call, "timeout", fallback: 3000))))
+        } catch {
+            call.resolve(["error": true, "errorMessage": error.localizedDescription, "servicesFound": 0, "services": []])
+            return
+        }
         let useNW = call.getBool("useNW") ?? true
-
         mdns.discover(type: type, name: targetName, timeoutMs: timeout, useNW: useNW) { result in
             switch result {
             case .success(let services):
@@ -122,4 +153,35 @@ public class mDNSPlugin: CAPPlugin, CAPBridgedPlugin {
             }
         }
     }
+
+    @objc public func watchServices(_ call: CAPPluginCall) {
+        guard let types = call.getArray("types", String.self), !types.isEmpty else {
+            call.resolve(["error": true, "errorMessage": "Expected a nonempty array of service types", "watchersStarted": 0])
+            return
+        }
+        mdns.watchServices(types: types) { result in
+            switch result {
+            case .success(let count): call.resolve(["error": false, "errorMessage": NSNull(), "watchersStarted": count])
+            case .failure(let error): call.resolve(["error": true, "errorMessage": error.localizedDescription, "watchersStarted": 0])
+            }
+        }
+    }
+
+    @objc public func stopWatching(_ call: CAPPluginCall) {
+        mdns.stopWatching {
+            call.resolve(["watching": false, "error": false, "errorMessage": NSNull()])
+        }
+    }
+}
+
+extension mDNSPlugin: MDNSWatchDelegate {
+    public func mdns(_ mdns: MDNS, didFindService service: [String: Any]) {
+        notifyListeners("serviceFound", data: ["service": service])
+    }
+    public func mdns(_ mdns: MDNS, didLoseService service: [String: Any]) {
+        notifyListeners("serviceLost", data: ["service": service])
+    }
+    public func mdns(_ mdns: MDNS, watchError type: String, message: String, watching: Bool) {
+        notifyListeners("watchError", data: ["type": type, "errorMessage": message, "watching": watching])
+    }
 }

package/ios/Tests/mDNSPluginTests/BridgeTests.swift

@@ -0,0 +1,46 @@
+import Capacitor
+import XCTest
+@testable import mDNSPlugin
+
+final class BridgeTests: XCTestCase {
+    private func invoke(_ method: String, options: [String: Any], perform: (CAPPluginCall) -> Void) throws -> [String: Any] {
+        var result: [String: Any]?
+        let call = try XCTUnwrap(CAPPluginCall(
+            callbackId: "test", methodName: method, options: options,
+            success: { response, _ in result = response?.data },
+            error: { _ in XCTFail("Invalid input must resolve with error: true") }
+        ))
+        perform(call)
+        return try XCTUnwrap(result)
+    }
+
+    func testBroadcastRejectsInvalidRawBridgeValues() throws {
+        let plugin = mDNSPlugin()
+        let cases: [[String: Any]] = [
+            ["port": 80.5], ["port": true], ["port": "80"], ["port": Double.nan],
+            ["port": 0], ["port": 65536], ["port": 80, "txt": ["a": 1]],
+            ["port": 80, "txt": ["a": true]], ["port": 80, "type": 1], ["port": 80, "name": true]
+        ]
+        for options in cases {
+            let result = try invoke("startBroadcast", options: options, perform: plugin.startBroadcast)
+            XCTAssertEqual(result["error"] as? Bool, true, "\(options)")
+            XCTAssertEqual(result["publishing"] as? Bool, false)
+            XCTAssertEqual(result["name"] as? String, "")
+            XCTAssertFalse(try XCTUnwrap(result["errorMessage"] as? String).isEmpty)
+        }
+    }
+
+    func testDiscoveryRejectsInvalidRawBridgeValues() throws {
+        let plugin = mDNSPlugin()
+        let cases: [[String: Any]] = [
+            ["timeout": true], ["timeout": "50"], ["timeout": Double.nan],
+            ["timeout": Double.infinity], ["type": 1], ["name": true]
+        ]
+        for options in cases {
+            let result = try invoke("discover", options: options, perform: plugin.discover)
+            XCTAssertEqual(result["error"] as? Bool, true)
+            XCTAssertEqual(result["servicesFound"] as? Int, 0)
+            XCTAssertTrue(try XCTUnwrap(result["services"] as? [Any]).isEmpty)
+        }
+    }
+}