@inthepocket/react-native-service-discovery 0.2.4 → 0.2.6

package/android/src/main/java/com/servicediscovery/ServiceDiscoveryModule.kt

@@ -3,6 +3,8 @@ package com.servicediscovery
 import android.content.Context
 import android.net.nsd.NsdManager
 import android.net.nsd.NsdServiceInfo
+import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
@@ -12,6 +14,7 @@ import com.facebook.react.bridge.WritableNativeArray
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import java.nio.charset.StandardCharsets
+import java.util.LinkedList
 
 
 class ServiceDiscoveryModule internal constructor(context: ReactApplicationContext) :
@@ -24,6 +27,21 @@ class ServiceDiscoveryModule internal constructor(context: ReactApplicationConte
   // Keep track of resolved services, because onServiceLost doesn't pass a resolved service
   private val resolvedServices: MutableMap<String, NsdServiceInfo> = HashMap()
 
+  // Resolve queue to handle Android's single-resolve limitation
+  private data class ResolveRequest(val service: NsdServiceInfo, var retryCount: Int = 0)
+  private val resolveQueue: LinkedList<ResolveRequest> = LinkedList()
+  private var isResolving: Boolean = false
+  private val mainHandler = Handler(Looper.getMainLooper())
+  private val pendingServices: MutableSet<String> = HashSet()
+
+  companion object {
+    private const val SERVICE_FOUND = "serviceFound"
+    private const val SERVICE_LOST = "serviceLost"
+    private const val MAX_RETRY_COUNT = 3
+    private const val RETRY_DELAY_MS = 100L
+    const val NAME = "ServiceDiscovery"
+  }
+
   override fun getName(): String {
     return NAME
   }
@@ -42,6 +60,86 @@ class ServiceDiscoveryModule internal constructor(context: ReactApplicationConte
   override fun removeListeners(count: Double) {
   }
 
+  private fun queueServiceForResolve(service: NsdServiceInfo) {
+    val serviceKey = "${service.serviceName}-${service.serviceType}"
+    synchronized(resolveQueue) {
+      // Skip if already pending or resolved
+      if (pendingServices.contains(serviceKey) || resolvedServices.containsKey(service.serviceName)) {
+        return
+      }
+      pendingServices.add(serviceKey)
+      resolveQueue.add(ResolveRequest(service))
+      Log.d(NAME, "Queued service for resolve: ${service.serviceName} (queue size: ${resolveQueue.size})")
+    }
+    processResolveQueue()
+  }
+
+  private fun processResolveQueue() {
+    synchronized(resolveQueue) {
+      if (isResolving || resolveQueue.isEmpty()) {
+        return
+      }
+      isResolving = true
+    }
+
+    val request = synchronized(resolveQueue) { resolveQueue.poll() } ?: run {
+      synchronized(resolveQueue) { isResolving = false }
+      return
+    }
+
+    Log.d(NAME, "Resolving service: ${request.service.serviceName} (attempt ${request.retryCount + 1})")
+
+    try {
+      nsdManager.resolveService(request.service, object : NsdManager.ResolveListener {
+        override fun onServiceResolved(serviceInfo: NsdServiceInfo) {
+          try {
+            val serviceKey = "${serviceInfo.serviceName}-${serviceInfo.serviceType}"
+            synchronized(resolveQueue) {
+              pendingServices.remove(serviceKey)
+            }
+            resolvedServices[serviceInfo.serviceName] = serviceInfo
+            sendEvent(SERVICE_FOUND, serviceToMap(serviceInfo))
+            Log.d(NAME, "Resolved service: ${serviceInfo.serviceName}")
+          } catch (e: Exception) {
+            Log.e(NAME, "Error handling resolved service", e)
+          } finally {
+            synchronized(resolveQueue) { isResolving = false }
+            // Small delay before processing next to avoid overwhelming NsdManager
+            mainHandler.postDelayed({ processResolveQueue() }, 50)
+          }
+        }
+
+        override fun onResolveFailed(serviceInfo: NsdServiceInfo, errorCode: Int) {
+          Log.e(NAME, "Resolve failed for ${serviceInfo.serviceName}: errorCode=$errorCode")
+
+          val serviceKey = "${serviceInfo.serviceName}-${serviceInfo.serviceType}"
+
+          // Retry on FAILURE_ALREADY_ACTIVE (3) or other transient errors
+          if (request.retryCount < MAX_RETRY_COUNT) {
+            request.retryCount++
+            synchronized(resolveQueue) {
+              resolveQueue.add(request) // Re-queue for retry
+            }
+            Log.d(NAME, "Re-queued ${serviceInfo.serviceName} for retry (attempt ${request.retryCount})")
+          } else {
+            synchronized(resolveQueue) {
+              pendingServices.remove(serviceKey)
+            }
+            Log.e(NAME, "Giving up on ${serviceInfo.serviceName} after ${MAX_RETRY_COUNT} retries")
+          }
+
+          synchronized(resolveQueue) { isResolving = false }
+          // Longer delay after failure before retrying
+          mainHandler.postDelayed({ processResolveQueue() }, RETRY_DELAY_MS)
+        }
+      })
+    } catch (e: Exception) {
+      Log.e(NAME, "Exception starting resolve", e)
+      synchronized(resolveQueue) { isResolving = false }
+      mainHandler.postDelayed({ processResolveQueue() }, RETRY_DELAY_MS)
+    }
+  }
+
   @ReactMethod
   override fun startSearch(type: String, promise: Promise) {
     try {
@@ -55,38 +153,22 @@ class ServiceDiscoveryModule internal constructor(context: ReactApplicationConte
       val discoveryListener: NsdManager.DiscoveryListener =
         object : NsdManager.DiscoveryListener {
           override fun onDiscoveryStarted(regType: String) {
-            // Service discovery started
+            Log.d(NAME, "Discovery started for $regType")
           }
 
           override fun onDiscoveryStopped(regType: String) {
-            // Service discovery stopped
+            Log.d(NAME, "Discovery stopped for $regType")
           }
 
           override fun onServiceFound(service: NsdServiceInfo) {
             try {
               // Service discovery success
               if (service.serviceType == serviceType) {
-                // Resolve the service with ad-hoc listener
-                nsdManager.resolveService(service, object : NsdManager.ResolveListener {
-                  override fun onServiceResolved(serviceInfo: NsdServiceInfo) {
-                    try {
-                      resolvedServices[serviceInfo.serviceName] = serviceInfo
-                      sendEvent(SERVICE_FOUND, serviceToMap(serviceInfo))
-                    } catch (e: Exception) {
-                      Log.e(NAME, "Error resolving service", e)
-                    }
-                  }
-
-                  override fun onResolveFailed(
-                    serviceInfo: NsdServiceInfo,
-                    errorCode: Int
-                  ) {
-                    Log.e(NAME, "Resolve failed: $errorCode")
-                  }
-                })
+                // Queue the service for resolution instead of resolving immediately
+                queueServiceForResolve(service)
               }
             } catch (e: Exception) {
-              Log.e(NAME, "Error resolving service", e)
+              Log.e(NAME, "Error queuing service for resolve", e)
             }
           }
 
@@ -101,24 +183,27 @@ class ServiceDiscoveryModule internal constructor(context: ReactApplicationConte
                 sendEvent(SERVICE_LOST, serviceToMap(serviceInfo))
               }
             } catch (e: Exception) {
-              Log.e(NAME, "Error resolving service", e)
+              Log.e(NAME, "Error handling service lost", e)
             }
           }
 
           override fun onStartDiscoveryFailed(serviceType: String, errorCode: Int) {
+            Log.e(NAME, "Discovery start failed: $errorCode")
             tryStopServiceDiscovery(this)
           }
 
           override fun onStopDiscoveryFailed(serviceType: String, errorCode: Int) {
+            Log.e(NAME, "Discovery stop failed: $errorCode")
             tryStopServiceDiscovery(this)
           }
         }
       discoveryListeners[serviceType] = discoveryListener
+
       nsdManager.discoverServices(serviceType, NsdManager.PROTOCOL_DNS_SD, discoveryListener)
       promise.resolve(null)
       return
     } catch (e: Exception) {
-      Log.e(NAME, "Error resolving service", e)
+      Log.e(NAME, "Error starting search", e)
       promise.reject(e)
     }
   }
@@ -127,16 +212,23 @@ class ServiceDiscoveryModule internal constructor(context: ReactApplicationConte
   override fun stopSearch(type: String, promise: Promise) {
     try {
       resolvedServices.clear()
+      synchronized(resolveQueue) {
+        resolveQueue.clear()
+        pendingServices.clear()
+        isResolving = false
+      }
+
       val serviceType = getServiceType(type)
       val discoveryListener = discoveryListeners.remove(serviceType)
       if (discoveryListener != null) {
         tryStopServiceDiscovery(discoveryListener)
       }
+
+      promise.resolve(null)
     } catch (e: Exception) {
-      Log.e(NAME, "Error resolving service", e)
+      Log.e(NAME, "Error stopping search", e)
       promise.reject(e)
     }
-
   }
 
   private fun tryStopServiceDiscovery(listener: NsdManager.DiscoveryListener) {
@@ -178,14 +270,8 @@ class ServiceDiscoveryModule internal constructor(context: ReactApplicationConte
       }
       service.putMap("txt", txt)
     } catch (e: Exception) {
-      Log.e(NAME, "Error stopping search", e)
+      Log.e(NAME, "Error converting service to map", e)
     }
     return service
   }
-
-  companion object {
-    private const val SERVICE_FOUND = "serviceFound"
-    private const val SERVICE_LOST = "serviceLost"
-    const val NAME = "ServiceDiscovery"
-  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inthepocket/react-native-service-discovery",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "mDNS Network Service Discovery in React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -61,13 +61,13 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@commitlint/config-conventional": "^19.8.1",
+    "@commitlint/config-conventional": "^20.5.0",
     "@evilmartians/lefthook": "^1.5.0",
     "@react-native/eslint-config": "^0.73.1",
-    "@release-it/conventional-changelog": "^9.0.4",
+    "@release-it/conventional-changelog": "^10.0.6",
     "@types/jest": "^29.5.5",
     "@types/react": "^18.2.44",
-    "commitlint": "^19.8.1",
+    "commitlint": "^20.5.0",
     "del-cli": "^5.1.0",
     "eslint": "^8.51.0",
     "eslint-config-prettier": "^9.0.0",
@@ -77,15 +77,14 @@
     "react": "18.2.0",
     "react-native": "0.74.0",
     "react-native-builder-bob": "^0.23.2",
-    "release-it": "^17.8.2",
+    "release-it": "^19.2.4",
     "turbo": "^1.10.7",
     "typescript": "^5.2.2"
   },
   "resolutions": {
     "@types/react": "^18.2.44",
-    "tmp": "^0.2.4",
-    "@conventional-changelog/git-client": "^2.0.0",
-    "@octokit/plugin-paginate-rest": "^13.0.0"
+    "handlebars": ">=4.7.9",
+    "basic-ftp": ">=5.2.0"
   },
   "peerDependencies": {
     "react": "*",