react-native-zeroconf 0.13.7 → 0.14.0

package/android/build.gradle

@@ -1,14 +1,3 @@
-buildscript {
-  repositories {
-      google()
-      mavenCentral()
-  }
-
-  dependencies {
-    classpath 'com.android.tools.build:gradle:3.5.1'
-  }
-}
-
 apply plugin: 'com.android.library'
 
 def safeExtGet(prop, fallback) {
@@ -16,34 +5,51 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 28)
-    buildToolsVersion "23.0.1"
+    compileSdkVersion safeExtGet('compileSdkVersion', 34)
+    ndkVersion safeExtGet('ndkVersion', '27.1.12297006')
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
-        targetSdkVersion safeExtGet('targetSdkVersion', 28)
+        minSdkVersion safeExtGet('minSdkVersion', 21)
+        targetSdkVersion safeExtGet('targetSdkVersion', 34)
         versionCode 1
         versionName "1.0"
+
         ndk {
-            abiFilters "armeabi-v7a", "x86"
+            abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+        }
+
+        externalNativeBuild {
+            ndkBuild {
+                arguments "NDK_APPLICATION_MK:=src/main/jni/Application.mk"
+            }
+        }
+    }
+
+    externalNativeBuild {
+        ndkBuild {
+            path "src/main/jni/Android.mk"
         }
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
+
+    // Namespace for Android Gradle Plugin 8.0+
+    namespace 'com.balthazargronon.RCTZeroconf'
 }
 
 repositories {
-  google()
-  mavenCentral()
+    google()
+    mavenCentral()
 }
 
 dependencies {
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    // https://mvnrepository.com/artifact/com.github.andriydruk/rx2dnssd
-    api group: 'com.github.andriydruk', name: 'rx2dnssd', version: '0.9.16'
+    // RxJava2 for Rx2Dnssd (bundled from Discord's RxDNSSD fork)
+    api 'io.reactivex.rxjava2:rxjava:2.2.21'
+    api 'io.reactivex.rxjava2:rxandroid:2.1.1'
     // https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
     api group: 'org.apache.commons', name: 'commons-lang3', version: '3.11'
 }

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.balthazargronon.RCTZeroconf">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

package/android/src/main/java/com/balthazargronon/RCTZeroconf/ZeroconfModule.java

@@ -52,7 +52,7 @@ public class ZeroconfModule extends ReactContextBaseJavaModule {
     public void scan(String type, String protocol, String domain, String implType) {
         try {
             getZeroconfImpl(implType).scan(type, protocol, domain);
-        } catch (Exception e) {
+        } catch (Throwable e) {
             Log.e(getClass().getName(), e.getMessage(), e);
             sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_ERROR, "Exception During Scan: " + e.getMessage());
         }
@@ -62,7 +62,7 @@ public class ZeroconfModule extends ReactContextBaseJavaModule {
     public void stop(String implType) {
         try {
             getZeroconfImpl(implType).stop();
-        } catch (Exception e) {
+        } catch (Throwable e) {
             Log.e(getClass().getName(), e.getMessage(), e);
             sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_ERROR, "Exception During Stop: " + e.getMessage());
         }
@@ -76,7 +76,7 @@ public class ZeroconfModule extends ReactContextBaseJavaModule {
     public void registerService(String type, String protocol, String domain, String name, int port, ReadableMap txt, String implType) {
         try {
             getZeroconfImpl(implType).registerService(type, protocol, domain, name, port, txt);
-        } catch (Exception e) {
+        } catch (Throwable e) {
             Log.e(getClass().getName(), e.getMessage(), e);
             sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_ERROR, "Exception During Register Service: " + e.getMessage());
         }
@@ -86,7 +86,7 @@ public class ZeroconfModule extends ReactContextBaseJavaModule {
     public void unregisterService(String serviceName, String implType) {
         try {
             getZeroconfImpl(implType).unregisterService(serviceName);
-        } catch (Exception e) {
+        } catch (Throwable e) {
             Log.e(getClass().getName(), e.getMessage(), e);
             sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_ERROR, "Exception During Unregister Service: " + e.getMessage());
         }
@@ -106,7 +106,7 @@ public class ZeroconfModule extends ReactContextBaseJavaModule {
         try {
             stop(ZeroConfImplFactory.NSD_IMPL);
             stop(ZeroConfImplFactory.DNSSD_IMPL);
-        } catch (Exception e) {
+        } catch (Throwable e) {
             Log.e(getClass().getName(), e.getMessage(), e);
             sendEvent(getReactApplicationContext(), ZeroconfModule.EVENT_ERROR, "Exception During Catalyst Destroy: " + e.getMessage());
         }

package/android/src/main/java/com/balthazargronon/RCTZeroconf/rx2dnssd/DnssdImpl.java

@@ -16,7 +16,7 @@ import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.github.druk.rx2dnssd.BonjourService;
 import com.github.druk.rx2dnssd.Rx2Dnssd;
-import com.github.druk.rx2dnssd.Rx2DnssdBindable;
+import com.github.druk.rx2dnssd.Rx2DnssdEmbedded;
 
 import java.net.InetAddress;
 import java.util.HashMap;
@@ -49,7 +49,17 @@ public class DnssdImpl implements Zeroconf {
         this.reactApplicationContext = reactApplicationContext;
         mPublishedServices = new HashMap<String, BonjourService>();
         mRegisteredDisposables = new HashMap<String, Disposable>();
-        rxDnssd = new Rx2DnssdBindable(reactApplicationContext);
+        rxDnssd = createDnssd(reactApplicationContext);
+    }
+
+    /**
+     * Creates the Rx2Dnssd implementation.
+     * Always uses embedded mDNSResponder since it works across all Android versions.
+     * The daemonic version (Rx2DnssdBindable) is unreliable on Android as the
+     * system daemon at /dev/socket/mdnsd doesn't exist on most devices.
+     */
+    private Rx2Dnssd createDnssd(Context context) {
+        return new Rx2DnssdEmbedded(context);
     }
 
     @Override
@@ -63,7 +73,13 @@ public class DnssdImpl implements Zeroconf {
             multicastLock.acquire();
         }
 
-        browseDisposable = rxDnssd.browse(getServiceType(type, protocol), "local.")
+        String serviceType = getServiceType(type, protocol);
+        Log.d("DnssdImpl", "Starting DNSSD scan for: " + serviceType);
+
+        // Emit start event
+        zeroconfModule.sendEvent(reactApplicationContext, ZeroconfModule.EVENT_START, null);
+
+        browseDisposable = rxDnssd.browse(serviceType, "local.")
                 .compose(rxDnssd.resolve())
                 .compose(rxDnssd.queryRecords())
                 .subscribeOn(Schedulers.io())

package/android/src/main/java/com/github/druk/dnssd/BaseListener.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2016 Andriy Druk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.github.druk.dnssd;
+
+
+/**	A base class for DNSSD listeners. */
+
+public interface BaseListener {
+	/** Called to report DNSSD operation failures.<P> 
+
+		@param	service
+					The service that encountered the failure.
+		<P>
+		@param	errorCode
+					Indicates the failure that occurred. See {@link DNSSDException} for error codes.
+	*/
+	void operationFailed(DNSSDService service, int errorCode);
+}
+

package/android/src/main/java/com/github/druk/dnssd/BrowseListener.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2016 Andriy Druk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.github.druk.dnssd;
+
+/**	A listener that receives results from {@link InternalDNSSD#browse}. */
+
+public interface BrowseListener extends BaseListener {
+	/** Called to report discovered services.<P>
+
+		@param	browser
+					The active browse service.
+		<P>
+		@param	flags
+					Possible values are DNSSD.MORE_COMING.
+		<P>
+		@param	ifIndex
+					The interface on which the service is advertised. This index should be passed
+					to {@link InternalDNSSD#resolve} when resolving the service.
+		<P>
+		@param	serviceName
+					The service name discovered.
+		<P>
+		@param	regType
+					The registration type, as passed in to DNSSD.browse().
+		<P>
+		@param	domain
+					The domain in which the service was discovered.
+	*/
+	void serviceFound(DNSSDService browser, int flags, int ifIndex, String serviceName, String regType, String domain);
+
+	/** Called to report services which have been deregistered.<P> 
+
+		@param	browser
+					The active browse service.
+		<P>
+		@param	flags
+					Possible values are DNSSD.MORE_COMING.
+		<P>
+		@param	ifIndex
+					The interface on which the service is advertised.
+		<P>
+		@param	serviceName
+					The service name which has deregistered.
+		<P>
+		@param	regType
+					The registration type, as passed in to DNSSD.browse().
+		<P>
+		@param	domain
+					The domain in which the service was discovered.
+	*/
+	void serviceLost(DNSSDService browser, int flags, int ifIndex, String serviceName, String regType, String domain);
+}
+

package/android/src/main/java/com/github/druk/dnssd/DNSRecord.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2016 Andriy Druk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.github.druk.dnssd;
+
+
+/**	
+	Reference to a record returned by {@link DNSSDRegistration#addRecord}.<P> 
+
+	Note: client is responsible for serializing access to these objects if 
+	they are shared between concurrent threads.
+*/
+
+public interface DNSRecord {
+	/** Update a registered resource record.<P> 
+		The record must either be the primary txt record of a service registered via DNSSD.register(), 
+		or a record added to a registered service via addRecord().<P>
+
+		@param	flags
+					Currently unused, reserved for future use.
+		<P>
+		@param	rData
+					The new rdata to be contained in the updated resource record.
+		<P>
+		@param	ttl
+					The time to live of the updated resource record, in seconds.
+	*/
+	void update(int flags, byte[] rData, int ttl) throws DNSSDException;
+
+	/** Remove a registered resource record.<P> 
+	*/
+	void remove() throws DNSSDException;
+}
+