@devioarts/capacitor-mdns 0.0.2 → 0.0.3

package/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
             targets: ["mDNSPlugin"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0")
     ],
     targets: [
         .target(

package/android/build.gradle

@@ -11,7 +11,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.2'
+        classpath 'com.android.tools.build:gradle:8.13.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24"
     }
 }
@@ -20,23 +20,23 @@ apply plugin: 'com.android.library'
 apply plugin: 'org.jetbrains.kotlin.android'
 
 android {
-    namespace "com.devioarts.capacitor.mdns"
-    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
+    namespace = "com.devioarts.capacitor.mdns"
+    compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        minSdk = project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
+        targetSdk = project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36
+        versionCode = 1
+        versionName = "1.0"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled = false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    lintOptions {
-        abortOnError false
+    lint {
+        abortOnError = false
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_21

package/android/src/main/java/com/devioarts/capacitor/mdns/mDNS.kt

@@ -4,9 +4,11 @@ package com.devioarts.capacitor.mdns
 import android.content.Context
 import android.net.nsd.NsdManager
 import android.net.nsd.NsdServiceInfo
+import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import kotlinx.coroutines.*
+import java.util.concurrent.Executor
 import java.util.concurrent.atomic.AtomicReference
 
 /**
@@ -33,7 +35,7 @@ class mDNS(
     data class MdnsService(
         val name: String,
         val type: String,
-        val host: String?, // numeric address (v4/v6) or null if resolve fails
+        val hosts: List<String>, // numeric addresses (v4/v6)
         val port: Int
     )
 
@@ -50,6 +52,7 @@ class mDNS(
 
     /** Main looper utilities for non-suspending entry points. */
     private val mainHandler = Handler(Looper.getMainLooper())
+    private val mainExecutor = Executor { command -> mainHandler.post(command) }
     private inline fun runOnMain(crossinline block: () -> Unit) {
         if (Looper.myLooper() === Looper.getMainLooper()) block() else mainHandler.post { block() }
     }
@@ -130,6 +133,7 @@ class mDNS(
         // Prepare state
         discListenerRef.getAndSet(null)?.let { safeStopDiscovery(it) }
         val found = mutableListOf<MdnsService>()
+        val serviceInfoCallbacks = mutableListOf<NsdManager.ServiceInfoCallback>()
         val result = CompletableDeferred<List<MdnsService>>()
 
         // Normalization for "(n)" suffix appended by the OS.
@@ -139,12 +143,70 @@ class mDNS(
             val t = normalize(targetName ?: return true) // if no target, accept all
             return (c == t) || c.startsWith(t)
         }
+        fun upsert(item: MdnsService) {
+            val index = found.indexOfFirst { it.name == item.name && it.type == item.type && it.port == item.port }
+            if (index >= 0) found[index] = item else found.add(item)
+        }
+        fun unregisterServiceInfoCallbacks() {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) return
+            serviceInfoCallbacks.toList().forEach { safeUnregisterServiceInfoCallback(it) }
+            serviceInfoCallbacks.clear()
+        }
+        fun completeWithCurrentResults(discoveryListener: NsdManager.DiscoveryListener) {
+            unregisterServiceInfoCallbacks()
+            safeStopDiscovery(discoveryListener)
+            if (!result.isCompleted) result.complete(found.toList())
+        }
+
+        @Suppress("DEPRECATION")
+        fun resolveLegacy(si: NsdServiceInfo, discoveryListener: NsdManager.DiscoveryListener) {
+            nsd.resolveService(si, object : NsdManager.ResolveListener {
+                override fun onResolveFailed(s: NsdServiceInfo, errorCode: Int) { /* ignore */ }
+
+                override fun onServiceResolved(s: NsdServiceInfo) {
+                    upsert(toMdnsService(s))
+
+                    // Early-exit for exact/prefix target match.
+                    if (targetName != null && matchesTarget(s.serviceName)) {
+                        completeWithCurrentResults(discoveryListener)
+                    }
+                }
+            })
+        }
+
+        fun registerServiceInfoCallback(si: NsdServiceInfo, discoveryListener: NsdManager.DiscoveryListener) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                resolveLegacy(si, discoveryListener)
+                return
+            }
+
+            val callback = object : NsdManager.ServiceInfoCallback {
+                override fun onServiceInfoCallbackRegistrationFailed(errorCode: Int) { /* ignore */ }
+                override fun onServiceInfoCallbackUnregistered() { /* no-op */ }
+                override fun onServiceLost() { /* no-op */ }
+
+                override fun onServiceUpdated(serviceInfo: NsdServiceInfo) {
+                    upsert(toMdnsService(serviceInfo))
+
+                    // Early-exit for exact/prefix target match.
+                    if (targetName != null && matchesTarget(serviceInfo.serviceName)) {
+                        completeWithCurrentResults(discoveryListener)
+                    }
+                }
+            }
+
+            serviceInfoCallbacks.add(callback)
+            try {
+                nsd.registerServiceInfoCallback(si, mainExecutor, callback)
+            } catch (_: Throwable) {
+                serviceInfoCallbacks.remove(callback)
+            }
+        }
 
         val listener = object : NsdManager.DiscoveryListener {
             override fun onStartDiscoveryFailed(serviceType: String, errorCode: Int) {
                 // Fail fast: stop discovery and complete with whatever we have (likely empty).
-                safeStopDiscovery(this)
-                if (!result.isCompleted) result.complete(found.toList())
+                completeWithCurrentResults(this)
             }
             override fun onStopDiscoveryFailed(serviceType: String, errorCode: Int) { /* no-op */ }
             override fun onDiscoveryStarted(serviceType: String) { /* no-op */ }
@@ -154,25 +216,7 @@ class mDNS(
                 if (targetName != null && !matchesTarget(si.serviceName)) return
 
                 val discoveryListener = this
-                nsd.resolveService(si, object : NsdManager.ResolveListener {
-                    override fun onResolveFailed(s: NsdServiceInfo, errorCode: Int) { /* ignore */ }
-
-                    override fun onServiceResolved(s: NsdServiceInfo) {
-                        val item = MdnsService(
-                            name = s.serviceName,
-                            type = s.serviceType,
-                            host = s.host?.hostAddress,
-                            port = s.port
-                        )
-                        found.add(item)
-
-                        // Early-exit for exact/prefix target match.
-                        if (targetName != null && matchesTarget(s.serviceName)) {
-                            safeStopDiscovery(discoveryListener)
-                            if (!result.isCompleted) result.complete(found.toList())
-                        }
-                    }
-                })
+                registerServiceInfoCallback(si, discoveryListener)
             }
 
             override fun onServiceLost(serviceInfo: NsdServiceInfo) { /* no-op */ }
@@ -184,8 +228,7 @@ class mDNS(
 
         val timeoutJob = scope.launch {
             delay(timeoutMs.toLong())
-            safeStopDiscovery(listener)
-            if (!result.isCompleted) result.complete(found.toList())
+            completeWithCurrentResults(listener)
         }
 
         try {
@@ -193,6 +236,7 @@ class mDNS(
         } finally {
             // Cleanup in all cases (early-exit or timeout)
             timeoutJob.cancel()
+            unregisterServiceInfoCallbacks()
             discListenerRef.getAndSet(null)?.let { safeStopDiscovery(it) }
         }
     }
@@ -218,4 +262,29 @@ class mDNS(
     private fun safeStopDiscovery(l: NsdManager.DiscoveryListener) {
         try { nsd.stopServiceDiscovery(l) } catch (_: Throwable) {}
     }
+
+    /** Best-effort stop service info updates; NSD may throw if not registered. */
+    private fun safeUnregisterServiceInfoCallback(l: NsdManager.ServiceInfoCallback) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            try { nsd.unregisterServiceInfoCallback(l) } catch (_: Throwable) {}
+        }
+    }
+
+    private fun toMdnsService(s: NsdServiceInfo): MdnsService =
+        MdnsService(
+            name = s.serviceName,
+            type = s.serviceType,
+            hosts = hostAddresses(s),
+            port = s.port
+        )
+
+    private fun hostAddresses(s: NsdServiceInfo): List<String> =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            s.hostAddresses.mapNotNull { it.hostAddress }
+        } else {
+            legacyHostAddress(s)?.let { listOf(it) } ?: emptyList()
+        }
+
+    @Suppress("DEPRECATION")
+    private fun legacyHostAddress(s: NsdServiceInfo): String? = s.host?.hostAddress
 }

package/android/src/main/java/com/devioarts/capacitor/mdns/mDNSPlugin.kt

@@ -26,7 +26,7 @@ import org.json.JSONObject
  * - discover       -> {
  *       error: boolean, errorMessage: string|null,
  *       servicesFound: number,
- *       services: Array<{ name, type, domain: "local.", port, hosts?: string[] }>
+ *       services: Array<{ name, type, domain: "local.", port, hosts: string[] }>
  *   }
  */
 @CapacitorPlugin(name = "mDNS")
@@ -139,10 +139,8 @@ class mDNSPlugin : Plugin() {
                         put("name", s.name)
                         put("type", s.type)         // Android returns full type with dot
                         put("domain", "local.")     // NSD is mDNS only
-                        // normalize hosts to [] or [addr]
                         val hosts = JSONArray()
-                        val addr = s.host
-                        if (!addr.isNullOrEmpty()) hosts.put(addr)
+                        s.hosts.forEach { hosts.put(it) }
                         put("hosts", hosts)
                         put("port", s.port)
                         // TXT not available via NSD -> omitted on Android

package/dist/esm/definitions.d.ts

@@ -3,7 +3,7 @@
  * Values are UTF-8 strings; binary payloads are not supported by this API.
  * @public
  */
-export declare type MdnsTxt = Record<string, string>;
+export type MdnsTxt = Record<string, string>;
 /**
  * Normalized description of a discovered Bonjour/mDNS service.
  * Returned from {@link mDNSPlugin.discover}.

package/electron/mdns-bridge.cjs

@@ -3,7 +3,6 @@
 //   const { createMDNSAPI } = require('.../electron/mdns-bridge.cjs')
 //   contextBridge.exposeInMainWorld('mDNS', createMDNSAPI({ ipcRenderer }))
 //   contextBridge.exposeInMainWorld('mdns', createMDNSAPI({ ipcRenderer })) // alias
-// eslint-disable-next-line no-undef
 module.exports.createMDNSAPI = ({ ipcRenderer }) => {
   return {
     /**
@@ -26,4 +25,4 @@ module.exports.createMDNSAPI = ({ ipcRenderer }) => {
      */
     discover: (options) => ipcRenderer.invoke('mdns:discover', options),
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devioarts/capacitor-mdns",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "mDNS plugin for CapacitorJS",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -57,31 +57,28 @@
     "release": "npm publish --access public"
   },
   "devDependencies": {
-    "@capacitor/android": "^7.0.0",
-    "@capacitor/core": "^7.0.0",
-    "@capacitor/docgen": "^0.3.0",
-    "@capacitor/ios": "^7.0.0",
-    "@ionic/eslint-config": "^0.4.0",
+    "@capacitor/android": "^8.4.0",
+    "@capacitor/core": "^8.4.0",
+    "@capacitor/docgen": "^0.3.1",
+    "@capacitor/ios": "^8.4.0",
     "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^2.0.0",
-    "eslint": "^8.57.0",
-    "prettier": "^3.4.2",
-    "prettier-plugin-java": "^2.6.6",
-    "rimraf": "^6.0.1",
-    "rollup": "^4.30.1",
+    "@typescript-eslint/eslint-plugin": "^8.61.0",
+    "@typescript-eslint/parser": "^8.61.0",
+    "bonjour-service": "^1.4.0",
+    "electron": "^42.4.0",
+    "eslint": "^10.4.1",
+    "prettier": "^3.8.4",
+    "prettier-plugin-java": "^2.9.7",
+    "rimraf": "^6.1.3",
+    "rollup": "^4.61.1",
     "swiftlint": "^2.0.0",
-    "typescript": "~4.1.5",
-    "electron": "^37.3.1",
-    "bonjour-service": "^1.3.0"
+    "typescript": "^6.0.3"
   },
   "peerDependencies": {
-    "@capacitor/core": ">=7.0.0"
+    "@capacitor/core": ">=8.0.0"
   },
   "prettier": "@ionic/prettier-config",
-  "swiftlint": "@ionic/swiftlint-config",
-  "eslintConfig": {
-    "extends": "@ionic/eslint-config/recommended"
-  },
   "capacitor": {
     "ios": {
       "src": "ios"