react-native-zeroconf 0.17.4 → 1.0.0-rc.2

package/NOTICE

@@ -28,12 +28,8 @@ limitations under the License.
 
 The following files are derived from RxDNSSD:
 
-android/src/main/jni/*
-  - Native mDNS/DNS-SD implementation (mDNSResponder)
-  - JNI bindings for Android
-
-android/src/main/java/com/github/druk/dnssd/*
-  - Java DNS-SD API classes
+android/src/main/jni/mdnsresponder/*
+  - Native mDNS/DNS-SD implementation (mDNSResponder), as distributed with RxDNSSD
 
 ================================================================================
 

package/Package.swift

@@ -5,6 +5,8 @@ import PackageDescription
 // (react-native >= 0.87). CocoaPods users are unaffected; see the podspec.
 // The two React Native packages are resolved by the autolinker relative to
 // build/generated/autolinking/libs/ReactNativeZeroconf in the app.
+// Same sources as the podspec: the C++ module, its Apple registration and the
+// codegen output shipped in ios/generated.
 let package = Package(
     name: "ReactNativeZeroconf",
     platforms: [.iOS(.v15)],
@@ -24,12 +26,26 @@ let package = Package(
                 .product(name: "ReactNativeDependenciesHeaders", package: "ReactNative"),
                 .product(name: "ReactAppHeaders", package: "React-GeneratedCode"),
             ],
-            path: "ios/RNZeroconf",
-            publicHeadersPath: ".",
+            path: ".",
+            sources: [
+                "cpp/Backend.cpp",
+                "cpp/ZeroconfModule.cpp",
+                "cpp/apple",
+                "cpp/dnssd",
+                "ios",
+            ],
+            publicHeadersPath: "ios/generated/ReactCodegen",
+            cxxSettings: [
+                .headerSearchPath("ios/generated/ReactCodegen"),
+                // Match the NDEBUG-gated C++ ABI of the prebuilt React Native frameworks
+                .define("DEBUG", .when(configuration: .debug)),
+                .define("NDEBUG", .when(configuration: .release)),
+            ],
             linkerSettings: [
                 .linkedFramework("Foundation"),
                 .linkedFramework("Network"),
             ]
         ),
-    ]
+    ],
+    cxxLanguageStandard: .cxx20
 )

package/README.md

@@ -21,8 +21,6 @@ yarn add react-native-zeroconf
 cd ios && pod install
 ```
 
-> **1.0 release candidate:** one C++ native module on every platform, for React Native 0.82 and later (New Architecture, Expo SDK 55 and later). Try it with `npm install react-native-zeroconf@next`, see [what changes from 0.17](https://zeroconf.balthazar.dev/Migrating-to-1.0). The documentation covers 0.17, which stays the default and keeps getting bug fixes.
-
 On iOS, declare the service types you use in `NSBonjourServices`, see [Permissions and Setup](https://zeroconf.balthazar.dev/Permissions-and-Setup). Expo works with development builds, see [Installation with Expo](https://zeroconf.balthazar.dev/Installation-Expo).
 
 ## Usage
@@ -62,4 +60,4 @@ zeroconf.scan({ type: 'http' })
 
 ## License
 
-MIT, see [LICENSE](LICENSE). Includes [RxDNSSD](https://github.com/discord/RxDNSSD) (Apache 2.0, see [NOTICE](NOTICE)) and Apple's mDNSResponder (mostly Apache 2.0, see its [LICENSE](android/src/main/jni/mdnsresponder/LICENSE)).
+MIT, see [LICENSE](LICENSE). Includes Apple's mDNSResponder for Android `DNSSD` (mostly Apache 2.0, see its [LICENSE](android/src/main/jni/mdnsresponder/LICENSE)), as distributed with [RxDNSSD](https://github.com/discord/RxDNSSD) (Apache 2.0, see [NOTICE](NOTICE)).

package/android/CMakeLists.txt

@@ -0,0 +1,64 @@
+# The C++ module on Android, built into the app's libappmodules.so by React Native's autolinking
+# (react-native.config.js): the module, the NSD backend, the dns_sd backend and the mDNSResponder embedded for DNSSD
+cmake_minimum_required(VERSION 3.13)
+project(react-native-zeroconf)
+
+set(ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..)
+set(MDNS ${CMAKE_CURRENT_SOURCE_DIR}/src/main/jni/mdnsresponder)
+
+# The embedded mDNSResponder, with the flags of the standalone build it comes from
+add_library(rnzeroconf_mdns STATIC
+  ${MDNS}/mDNSCore/mDNS.c
+  ${MDNS}/mDNSCore/DNSDigest.c
+  ${MDNS}/mDNSCore/uDNS.c
+  ${MDNS}/mDNSCore/DNSCommon.c
+  ${MDNS}/mDNSPosix/mDNSPosix.c
+  ${MDNS}/mDNSPosix/mDNSUNP.c
+  ${MDNS}/mDNSPosix/PosixDaemon.c
+  ${MDNS}/mDNSShared/mDNSDebug.c
+  ${MDNS}/mDNSShared/dnssd_clientlib.c
+  ${MDNS}/mDNSShared/dnssd_clientshim.c
+  ${MDNS}/mDNSShared/dnssd_ipc.c
+  ${MDNS}/mDNSShared/GenLinkedList.c
+  ${MDNS}/mDNSShared/PlatformCommon.c
+  ${MDNS}/mDNSShared/uds_daemon.c
+)
+target_compile_definitions(rnzeroconf_mdns PRIVATE
+  _GNU_SOURCE HAVE_IPV6 HAVE_LINUX NOT_HAVE_SA_LEN PLATFORM_NO_RLIMIT TARGET_OS_LINUX USES_NETLINK
+  MDNS_DEBUGMSGS=0 MDNS_UDS_SERVERPATH="/dev/socket/mdnsd" MDNS_USERNAME="mdnsr"
+  SO_REUSEADDR UNICAST_DISABLED MDNS_VERSIONSTR_NODTS=1 EMBEDDED
+)
+set_source_files_properties(${MDNS}/mDNSPosix/PosixDaemon.c PROPERTIES
+  # The standalone daemon's main, unused here
+  COMPILE_DEFINITIONS main=mdnsd_main
+)
+target_compile_options(rnzeroconf_mdns PRIVATE -Os -fno-strict-aliasing -fwrapv -w)
+target_include_directories(rnzeroconf_mdns
+  PUBLIC ${MDNS}/mDNSShared
+  PRIVATE ${MDNS}/mDNSPosix ${MDNS}/mDNSCore ${CMAKE_CURRENT_SOURCE_DIR}/src/main/jni
+)
+target_link_libraries(rnzeroconf_mdns log)
+
+add_library(react-native-zeroconf STATIC
+  ${ROOT}/cpp/Backend.cpp
+  ${ROOT}/cpp/ZeroconfModule.cpp
+  ${ROOT}/cpp/dnssd/DnssdBackend.cpp
+  ${ROOT}/cpp/embedded/EmbeddedExecutor.cpp
+  ${ROOT}/cpp/android/ZeroconfAndroidModule.cpp
+  ${ROOT}/cpp/android/NsdBackend.cpp
+)
+set_target_properties(react-native-zeroconf PROPERTIES
+  CXX_STANDARD 20
+  CXX_STANDARD_REQUIRED ON
+  CXX_EXTENSIONS OFF
+)
+# The autolinked module provider includes <ZeroconfAndroidModule.h>
+target_include_directories(react-native-zeroconf PUBLIC ${ROOT}/cpp ${ROOT}/cpp/android)
+target_link_libraries(react-native-zeroconf
+  jsi
+  reactnative
+  fbjni
+  react_codegen_RNZeroconfSpec
+  rnzeroconf_mdns
+  log
+)

package/android/build.gradle

@@ -6,26 +6,12 @@ def safeExtGet(prop, fallback) {
 
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', 34)
-    ndkVersion safeExtGet('ndkVersion', '27.1.12297006')
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 21)
+        minSdkVersion safeExtGet('minSdkVersion', 24)
         targetSdkVersion safeExtGet('targetSdkVersion', 34)
         versionCode 1
         versionName "1.0"
-        // Instrumented tests (android/src/androidTest), see docs/Contributing.md
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-        }
-
-    }
-
-    externalNativeBuild {
-        ndkBuild {
-            path "src/main/jni/Android.mk"
-        }
     }
 
     compileOptions {
@@ -44,6 +30,4 @@ repositories {
 
 dependencies {
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    androidTestImplementation 'androidx.test:runner:1.6.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
 }

package/android/generated/java/com/balthazargronon/RCTZeroconf/NativeZeroconfSpec.java

@@ -0,0 +1,96 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJavaSpec.js
+ *
+ * @nolint
+ */
+
+package com.balthazargronon.RCTZeroconf;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import javax.annotation.Nonnull;
+
+public abstract class NativeZeroconfSpec extends ReactContextBaseJavaModule implements TurboModule {
+  public static final String NAME = "Zeroconf";
+
+  public NativeZeroconfSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @Override
+  public @Nonnull String getName() {
+    return NAME;
+  }
+
+  protected final void emitOnStart(ReadableMap value) {
+    mEventEmitterCallback.invoke("onStart", value);
+  }
+
+  protected final void emitOnStop(ReadableMap value) {
+    mEventEmitterCallback.invoke("onStop", value);
+  }
+
+  protected final void emitOnFound(ReadableMap value) {
+    mEventEmitterCallback.invoke("onFound", value);
+  }
+
+  protected final void emitOnRemove(ReadableMap value) {
+    mEventEmitterCallback.invoke("onRemove", value);
+  }
+
+  protected final void emitOnResolved(ReadableMap value) {
+    mEventEmitterCallback.invoke("onResolved", value);
+  }
+
+  protected final void emitOnError(ReadableMap value) {
+    mEventEmitterCallback.invoke("onError", value);
+  }
+
+  protected final void emitOnPublished(ReadableMap value) {
+    mEventEmitterCallback.invoke("onPublished", value);
+  }
+
+  protected final void emitOnUnpublished(ReadableMap value) {
+    mEventEmitterCallback.invoke("onUnpublished", value);
+  }
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void scan(String scanId, String type, String protocol, String domain, String implType, ReadableMap options);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void stop(String scanId, String implType);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void registerService(String type, String protocol, String domain, String name, double port, ReadableArray txt, String implType, ReadableMap options, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void updateService(String name, ReadableArray txt, String implType, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void unregisterService(String name, String implType, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void resolveService(String name, String type, String protocol, String domain, String implType, ReadableMap options, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void checkLocalNetworkAccess(String type, double timeout, Promise promise);
+}

package/android/generated/jni/CMakeLists.txt

@@ -0,0 +1,28 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/RNZeroconfSpec/*.cpp)
+
+add_library(
+  react_codegen_RNZeroconfSpec
+  OBJECT
+  ${react_codegen_SRCS}
+)
+
+target_include_directories(react_codegen_RNZeroconfSpec PUBLIC . react/renderer/components/RNZeroconfSpec)
+
+target_link_libraries(
+  react_codegen_RNZeroconfSpec
+  fbjni
+  jsi
+  # We need to link different libraries based on whether we are building rncore or not, that's necessary
+  # because we want to break a circular dependency between react_codegen_rncore and reactnative
+  reactnative
+)
+
+target_compile_reactnative_options(react_codegen_RNZeroconfSpec PRIVATE)

package/android/generated/jni/RNZeroconfSpec-generated.cpp

@@ -0,0 +1,77 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJniCpp.js
+ */
+
+#include "RNZeroconfSpec.h"
+
+namespace facebook::react {
+
+static facebook::jsi::Value __hostFunction_NativeZeroconfSpecJSI_scan(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, VoidKind, "scan", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/facebook/react/bridge/ReadableMap;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeZeroconfSpecJSI_stop(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, VoidKind, "stop", "(Ljava/lang/String;Ljava/lang/String;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeZeroconfSpecJSI_registerService(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "registerService", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DLcom/facebook/react/bridge/ReadableArray;Ljava/lang/String;Lcom/facebook/react/bridge/ReadableMap;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeZeroconfSpecJSI_updateService(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "updateService", "(Ljava/lang/String;Lcom/facebook/react/bridge/ReadableArray;Ljava/lang/String;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeZeroconfSpecJSI_unregisterService(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "unregisterService", "(Ljava/lang/String;Ljava/lang/String;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeZeroconfSpecJSI_resolveService(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "resolveService", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/facebook/react/bridge/ReadableMap;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeZeroconfSpecJSI_checkLocalNetworkAccess(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "checkLocalNetworkAccess", "(Ljava/lang/String;DLcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+NativeZeroconfSpecJSI::NativeZeroconfSpecJSI(const JavaTurboModule::InitParams &params)
+  : JavaTurboModule(params) {
+  methodMap_["scan"] = MethodMetadata {6, __hostFunction_NativeZeroconfSpecJSI_scan};
+  methodMap_["stop"] = MethodMetadata {2, __hostFunction_NativeZeroconfSpecJSI_stop};
+  methodMap_["registerService"] = MethodMetadata {8, __hostFunction_NativeZeroconfSpecJSI_registerService};
+  methodMap_["updateService"] = MethodMetadata {3, __hostFunction_NativeZeroconfSpecJSI_updateService};
+  methodMap_["unregisterService"] = MethodMetadata {2, __hostFunction_NativeZeroconfSpecJSI_unregisterService};
+  methodMap_["resolveService"] = MethodMetadata {6, __hostFunction_NativeZeroconfSpecJSI_resolveService};
+  methodMap_["checkLocalNetworkAccess"] = MethodMetadata {2, __hostFunction_NativeZeroconfSpecJSI_checkLocalNetworkAccess};
+  eventEmitterMap_["onStart"] = std::make_shared<AsyncEventEmitter<folly::dynamic>>();
+  eventEmitterMap_["onStop"] = std::make_shared<AsyncEventEmitter<folly::dynamic>>();
+  eventEmitterMap_["onFound"] = std::make_shared<AsyncEventEmitter<folly::dynamic>>();
+  eventEmitterMap_["onRemove"] = std::make_shared<AsyncEventEmitter<folly::dynamic>>();
+  eventEmitterMap_["onResolved"] = std::make_shared<AsyncEventEmitter<folly::dynamic>>();
+  eventEmitterMap_["onError"] = std::make_shared<AsyncEventEmitter<folly::dynamic>>();
+  eventEmitterMap_["onPublished"] = std::make_shared<AsyncEventEmitter<folly::dynamic>>();
+  eventEmitterMap_["onUnpublished"] = std::make_shared<AsyncEventEmitter<folly::dynamic>>();
+  configureEventEmitterCallback();
+}
+
+std::shared_ptr<TurboModule> RNZeroconfSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {
+  if (moduleName == "Zeroconf") {
+    return std::make_shared<NativeZeroconfSpecJSI>(params);
+  }
+  return nullptr;
+}
+
+} // namespace facebook::react

package/android/generated/jni/RNZeroconfSpec.h

@@ -0,0 +1,31 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJniH.js
+ */
+
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
+
+namespace facebook::react {
+
+/**
+ * JNI C++ class for module 'NativeZeroconf'
+ */
+class JSI_EXPORT NativeZeroconfSpecJSI : public JavaTurboModule {
+public:
+  NativeZeroconfSpecJSI(const JavaTurboModule::InitParams &params);
+};
+
+
+JSI_EXPORT
+std::shared_ptr<TurboModule> RNZeroconfSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params);
+
+} // namespace facebook::react