react-native-acoustic-connect-beta 18.0.17 → 18.0.19

package/nitrogen/generated/shared/c++/HybridAcousticConnectRNSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridAcousticConnectRNSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -17,6 +17,7 @@
 
 #include <string>
 #include <variant>
+#include <NitroModules/Null.hpp>
 #include <optional>
 #include <unordered_map>
 
@@ -54,25 +55,25 @@ namespace margelo::nitro::acousticconnectrn {
       virtual bool setBooleanConfigItemForKey(const std::string& key, bool value, const std::string& moduleName) = 0;
       virtual bool setStringItemForKey(const std::string& key, const std::string& value, const std::string& moduleName) = 0;
       virtual bool setNumberItemForKey(const std::string& key, double value, const std::string& moduleName) = 0;
-      virtual bool setConfigItemForKey(const std::string& key, const std::variant<std::string, double, bool>& value, const std::string& moduleName) = 0;
+      virtual bool setConfigItemForKey(const std::string& key, const std::variant<bool, std::string, double>& value, const std::string& moduleName) = 0;
       virtual bool getBooleanConfigItemForKey(bool theDefault, const std::string& key, const std::string& moduleName) = 0;
-      virtual std::optional<std::string> getStringItemForKey(const std::string& theDefault, const std::string& key, const std::string& moduleName) = 0;
+      virtual std::optional<std::variant<nitro::NullType, std::string>> getStringItemForKey(const std::string& theDefault, const std::string& key, const std::string& moduleName) = 0;
       virtual double getNumberItemForKey(double theDefault, const std::string& key, const std::string& moduleName) = 0;
-      virtual bool logCustomEvent(const std::string& eventName, const std::unordered_map<std::string, std::variant<std::string, double, bool>>& values, double level) = 0;
-      virtual bool logSignal(const std::unordered_map<std::string, std::variant<std::string, double, bool>>& values, double level) = 0;
+      virtual bool logCustomEvent(const std::string& eventName, const std::unordered_map<std::string, std::variant<bool, std::string, double>>& values, double level) = 0;
+      virtual bool logSignal(const std::unordered_map<std::string, std::variant<bool, std::string, double>>& values, double level) = 0;
       virtual bool logExceptionEvent(const std::string& message, const std::string& stackInfo, bool unhandled) = 0;
       virtual bool logLocation() = 0;
       virtual bool logLocationWithLatitudeLongitude(double latitude, double longitude, double level) = 0;
       virtual bool logClickEvent(double target, const std::string& controlId) = 0;
-      virtual bool logTextChangeEvent(double target, const std::string& controlId, const std::optional<std::string>& text) = 0;
+      virtual bool logTextChangeEvent(double target, const std::string& controlId, const std::optional<std::variant<nitro::NullType, std::string>>& text) = 0;
       virtual bool setCurrentScreenName(const std::string& logicalPageName) = 0;
-      virtual bool logScreenViewContextLoad(const std::optional<std::string>& logicalPageName, const std::optional<std::string>& referrer) = 0;
-      virtual bool logScreenViewContextUnload(const std::optional<std::string>& logicalPageName, const std::optional<std::string>& referrer) = 0;
+      virtual bool logScreenViewContextLoad(const std::optional<std::variant<nitro::NullType, std::string>>& logicalPageName, const std::optional<std::variant<nitro::NullType, std::string>>& referrer) = 0;
+      virtual bool logScreenViewContextUnload(const std::optional<std::variant<nitro::NullType, std::string>>& logicalPageName, const std::optional<std::variant<nitro::NullType, std::string>>& referrer) = 0;
       virtual bool logScreenLayout(const std::string& name, double delay) = 0;
       virtual bool logDialogShowEvent(const std::string& dialogId, const std::string& dialogTitle, const std::string& dialogType) = 0;
       virtual bool logDialogDismissEvent(const std::string& dialogId, const std::string& dismissReason) = 0;
       virtual bool logDialogButtonClickEvent(const std::string& dialogId, const std::string& buttonText, double buttonIndex) = 0;
-      virtual bool logDialogCustomEvent(const std::string& dialogId, const std::string& eventName, const std::unordered_map<std::string, std::variant<std::string, double, bool>>& values) = 0;
+      virtual bool logDialogCustomEvent(const std::string& dialogId, const std::string& eventName, const std::unordered_map<std::string, std::variant<bool, std::string, double>>& values) = 0;
 
     protected:
       // Hybrid Setup

package/package.json

@@ -14,12 +14,12 @@
         "@types/jest": "^29.5.12",
         "@types/react": "^19.0.10",
         "jetifier": "^1.6.3",
-        "nitro-codegen": "0.25.2",
+        "nitrogen": "0.35.4",
         "prettier-plugin-kotlin": "^2.1.0",
         "react": "19.0.0",
         "react-native": "0.78.0",
         "react-native-builder-bob": "^0.37.0",
-        "react-native-nitro-modules": "0.25.1",
+        "react-native-nitro-modules": "0.35.4",
         "release-it": "^19.0.2",
         "typescript": "5.0.4"
     },
@@ -96,7 +96,7 @@
     "peerDependencies": {
         "react": "*",
         "react-native": "*",
-        "react-native-nitro-modules": "*"
+        "react-native-nitro-modules": ">=0.35.0 <0.36.0"
     },
     "prettier": {
         "quoteProps": "consistent",
@@ -180,7 +180,7 @@
     "scripts": {
         "applyConfiguration": "node scripts/applyConfiguration.js $INIT_CWD",
         "build": "npm run typecheck && bob build",
-        "codegen": "nitro-codegen --logLevel=\"debug\" && npm run build && node post-script.js",
+        "codegen": "nitrogen --logLevel=\"debug\" && npm run build && node post-script.js",
         "postinstall": "./scripts/postInstallScripts.sh",
         "rebuild": "npm run codegen && npm run rebuildExample --prefix ./example",
         "release": "release-it",
@@ -192,7 +192,7 @@
     "source": "src/index",
     "summary": "react-native ios android tealeaf connect cxa wxca er enhanced-replay",
     "types": "./lib/typescript/src/index.d.ts",
-    "version": "18.0.17",
+    "version": "18.0.19",
     "workspaces": [
         "example"
     ]

package/scripts/ConnectConfig.json

@@ -1,6 +1,6 @@
 {
     "Connect": {
-        "AndroidVersion": "10.4.61",
+        "AndroidVersion": "11.0.7-beta",
         "AppKey": "b6c3709b7a4c479bb4b5a9fb8fec324c",
         "KillSwitchUrl": "https://lib-us-2.brilliantcollector.com/collector/switch/b6c3709b7a4c479bb4b5a9fb8fec324c",
         "PostMessageUrl": "https://lib-us-2.brilliantcollector.com/collector/collectorPost",

package/scripts/gradleParser.js

@@ -15,17 +15,16 @@ const directoryPath = path.join(__dirname,"..","..","..")
 
 console.log("Run gradleParser.js");
 
-if(!isValid(`${directoryPath}/android`)){
-  console.log("Directory not valid:")
-  console.log(`${directoryPath}/android`)
+const gradleCode = `apply from: project(':react-native-acoustic-connect-beta').projectDir.getPath() + "/config.gradle"`
+const filePath = `${directoryPath}/android/app/build.gradle`
+
+if(!isValid(filePath)){
+  console.log("File not found, skipping:", filePath)
   exit(0)
 }
 
-const gradleCode = `apply from: project(':react-native-acoustic-connect-beta').projectDir.getPath() + "/config.gradle"`
-
 let gradleData = '';
 try {
-  const filePath = `${directoryPath}/android/app/build.gradle`
     gradleData = fs.readFileSync(filePath, 'utf8');
     console.log("Read: " + filePath);
     console.log(gradleData);

package/scripts/postInstallScripts.sh

@@ -4,7 +4,6 @@ echo "Current directory:"
 pwd
 echo "Running Node scripts..."
 node ./scripts/reviewConnectConfig.js
-node ./scripts/javaParser.js
 node ./scripts/xmlParser.js
 node ./scripts/gradleParser.js
 echo "*********************************************************************************************"

package/scripts/xmlparser.js

@@ -17,13 +17,12 @@ const { isValid } = require('./util');
 console.log("Run xmlParser.js");
 
 const directoryPath = path.join(__dirname,"..","..","..")
-if(!isValid(`${directoryPath}/android`)){
-  console.log("Directory not valid:")
-  console.log(`${directoryPath}/android`)
+const filePath = `${directoryPath}/android/app/src/main/AndroidManifest.xml`;
+
+if(!isValid(filePath)){
+  console.log("File not found, skipping:", filePath)
   exit(0)
 }
-
-const filePath = `${directoryPath}/android/app/src/main/AndroidManifest.xml`;
 const permssions = ['android.permission.INTERNET',
 'android.permission.ACCESS_NETWORK_STATE',
 'android.permission.ACCESS_WIFI_STATE',

package/src/components/Connect.tsx

@@ -19,7 +19,8 @@ interface ConnectProps {
 }
 
 const Connect: React.FC<ConnectProps> = ({ children, captureKeyboardEvents, captureDialogEvents = false }) => {
-    const navigation = (children as any).ref; // Type assertion for children with ref
+    const child = children as any;
+    const navigation = child.props?.ref ?? child.ref;
     const currentRoute = useRef<string | undefined>(undefined);
     const initial = useRef<boolean>(false);
 

package/nitrogen/generated/android/c++/JVariant_String_Double_Boolean.hpp

@@ -1,98 +0,0 @@
-///
-/// JVariant_String_Double_Boolean.hpp
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
-///
-
-#pragma once
-
-#include <fbjni/fbjni.h>
-#include <variant>
-
-#include <variant>
-#include <string>
-
-namespace margelo::nitro::acousticconnectrn {
-
-  using namespace facebook;
-
-  /**
-   * The C++ JNI bridge between the C++ std::variant and the Java class "Variant_String_Double_Boolean".
-   */
-  class JVariant_String_Double_Boolean: public jni::JavaClass<JVariant_String_Double_Boolean> {
-  public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/acousticconnectrn/Variant_String_Double_Boolean;";
-
-    static jni::local_ref<JVariant_String_Double_Boolean> create_0(jni::alias_ref<jni::JString> value) {
-      static const auto method = javaClassStatic()->getStaticMethod<JVariant_String_Double_Boolean(jni::alias_ref<jni::JString>)>("create");
-      return method(javaClassStatic(), value);
-    }
-    static jni::local_ref<JVariant_String_Double_Boolean> create_1(double value) {
-      static const auto method = javaClassStatic()->getStaticMethod<JVariant_String_Double_Boolean(double)>("create");
-      return method(javaClassStatic(), value);
-    }
-    static jni::local_ref<JVariant_String_Double_Boolean> create_2(jboolean value) {
-      static const auto method = javaClassStatic()->getStaticMethod<JVariant_String_Double_Boolean(jboolean)>("create");
-      return method(javaClassStatic(), value);
-    }
-
-    static jni::local_ref<JVariant_String_Double_Boolean> fromCpp(const std::variant<std::string, double, bool>& variant) {
-      switch (variant.index()) {
-        case 0: return create_0(jni::make_jstring(std::get<0>(variant)));
-        case 1: return create_1(std::get<1>(variant));
-        case 2: return create_2(std::get<2>(variant));
-        default: throw std::invalid_argument("Variant holds unknown index! (" + std::to_string(variant.index()) + ")");
-      }
-    }
-
-    [[nodiscard]] std::variant<std::string, double, bool> toCpp() const;
-  };
-
-  namespace JVariant_String_Double_Boolean_impl {
-    class First: public jni::JavaClass<First, JVariant_String_Double_Boolean> {
-    public:
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/acousticconnectrn/Variant_String_Double_Boolean$First;";
-    
-      [[nodiscard]] jni::local_ref<jni::JString> getValue() const {
-        static const auto field = javaClassStatic()->getField<jni::JString>("value");
-        return getFieldValue(field);
-      }
-    };
-    
-    class Second: public jni::JavaClass<Second, JVariant_String_Double_Boolean> {
-    public:
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/acousticconnectrn/Variant_String_Double_Boolean$Second;";
-    
-      [[nodiscard]] double getValue() const {
-        static const auto field = javaClassStatic()->getField<double>("value");
-        return getFieldValue(field);
-      }
-    };
-    
-    class Third: public jni::JavaClass<Third, JVariant_String_Double_Boolean> {
-    public:
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/acousticconnectrn/Variant_String_Double_Boolean$Third;";
-    
-      [[nodiscard]] jboolean getValue() const {
-        static const auto field = javaClassStatic()->getField<jboolean>("value");
-        return getFieldValue(field);
-      }
-    };
-  } // namespace JVariant_String_Double_Boolean_impl
-
-  std::variant<std::string, double, bool> JVariant_String_Double_Boolean::toCpp() const {
-    if (isInstanceOf(JVariant_String_Double_Boolean_impl::First::javaClassStatic())) {
-      auto jniValue = static_cast<const JVariant_String_Double_Boolean_impl::First*>(this)->getValue();
-      return jniValue->toStdString();
-    } else if (isInstanceOf(JVariant_String_Double_Boolean_impl::Second::javaClassStatic())) {
-      auto jniValue = static_cast<const JVariant_String_Double_Boolean_impl::Second*>(this)->getValue();
-      return jniValue;
-    } else if (isInstanceOf(JVariant_String_Double_Boolean_impl::Third::javaClassStatic())) {
-      auto jniValue = static_cast<const JVariant_String_Double_Boolean_impl::Third*>(this)->getValue();
-      return static_cast<bool>(jniValue);
-    }
-    throw std::invalid_argument("Variant is unknown Kotlin instance!");
-  }
-
-} // namespace margelo::nitro::acousticconnectrn

package/nitrogen/generated/android/kotlin/com/margelo/nitro/acousticconnectrn/Variant_String_Double_Boolean.kt

@@ -1,49 +0,0 @@
-///
-/// Variant_String_Double_Boolean.kt
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
-///
-
-package com.margelo.nitro.acousticconnectrn
-
-import com.facebook.proguard.annotations.DoNotStrip
-
-/**
- * Represents the TypeScript variant "String|Double|Boolean".
- */
-@Suppress("ClassName")
-@DoNotStrip
-sealed class Variant_String_Double_Boolean {
-  @DoNotStrip
-  data class First(@DoNotStrip val value: String): Variant_String_Double_Boolean()
-  @DoNotStrip
-  data class Second(@DoNotStrip val value: Double): Variant_String_Double_Boolean()
-  @DoNotStrip
-  data class Third(@DoNotStrip val value: Boolean): Variant_String_Double_Boolean()
-
-  inline fun <reified T> getAs(): T? = when (this) {
-    is First -> value as? T
-    is Second -> value as? T
-    is Third -> value as? T
-  }
-
-  val isFirst: Boolean
-    get() = this is First
-  val isSecond: Boolean
-    get() = this is Second
-  val isThird: Boolean
-    get() = this is Third
-
-  companion object {
-    @JvmStatic
-    @DoNotStrip
-    fun create(value: String): Variant_String_Double_Boolean = First(value)
-    @JvmStatic
-    @DoNotStrip
-    fun create(value: Double): Variant_String_Double_Boolean = Second(value)
-    @JvmStatic
-    @DoNotStrip
-    fun create(value: Boolean): Variant_String_Double_Boolean = Third(value)
-  }
-}

package/nitrogen/generated/ios/swift/Variant_String_Double_Bool.swift

@@ -1,17 +0,0 @@
-///
-/// Variant_String_Double_Bool.swift
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
-///
-
-/**
- * An Swift enum with associated values representing a Variant/Union type.
- * JS type: `string | number | boolean`
- */
-@frozen
-public enum Variant_String_Double_Bool {
-  case first(String)
-  case second(Double)
-  case third(Bool)
-}

package/scripts/javaParser.js

@@ -1,183 +0,0 @@
-/********************************************************************************************
-* Copyright (C) 2025 Acoustic, L.P. All rights reserved.
-*
-* NOTICE: This file contains material that is confidential and proprietary to
-* Acoustic, L.P. and/or other developers. No license is granted under any intellectual or
-* industrial property rights of Acoustic, L.P. except as may be provided in an agreement with
-* Acoustic, L.P. Any unauthorized copying or distribution of content from this file is
-* prohibited.
-********************************************************************************************/
-const prettier = require("prettier");
-const fs = require("fs");
-const path = require("path");
-const javaPaserPlugin = require("prettier-plugin-java");
-const { XMLParser, XMLBuilder } = require("fast-xml-parser");
-const { exit } = require("process");
-const { isValid } = require('./util');
-const directoryPath = path.join(__dirname, "..", "..", "..");
-
-console.log("Run javaParser.js");
-
-if (!isValid(`${directoryPath}/android`)) {
-  console.log("Directory not valid:")
-  console.log(`${directoryPath}/android`)
-  exit(0);
-}
-
-function readFile(path) {
-  let data = "";
-  if (fs.existsSync(path)) {
-    try {
-      data = fs.readFileSync(path, "utf8");
-      console.log("Read: " + path);
-    } catch (err) {
-      console.log("Error reading: " + path);
-      console.error(err);
-    }
-  } else {
-    console.log("File not found: " + path);
-  }
-  return data;
-}
-
-const buildGradlePath = `${directoryPath}/android/app/build.gradle`;
-console.log("Read build.gradle to get applicationId");
-const buildGradleFile = readFile(buildGradlePath)
-
-const regex = /applicationId.*/g;
-const foundIt = buildGradleFile.match(regex);
-
-let packageName = null
-if (foundIt != null && foundIt[0] != null) {
-  const singleQuote = foundIt[0].split("'");
-  const doubleQuote = foundIt[0].split('"');
-  if (singleQuote != null && singleQuote.length >= 2) {
-    packageName = singleQuote[1];
-  } else if (doubleQuote != null && doubleQuote.length >= 2) {
-    packageName = doubleQuote[1];
-  }
-}
-
-if (packageName == null) {
-  const xmlFilePath = `${directoryPath}/android/app/src/main/AndroidManifest.xml`;
-  console.log("Did not find it in " + buildGradlePath + ". I will look in " + xmlFilePath);
-  const manifestFile = readFile(xmlFilePath)
-  const options = {
-    ignoreAttributes: false,
-    format: true,
-    preserveOrder: false,
-  };
-  const parser = new XMLParser(options);
-  const jsonObj = parser.parse(manifestFile);
-  packageName = jsonObj["manifest"]["@_package"];
-}
-
-console.log("Found the following applicationId:" + packageName);
-if (packageName == null) {
-  console.log("applicationId not found:")
-  exit(0);
-}
-
-const upperJavaPath = packageName.replace(/\./g, "/");
-const mainActivityPathBase = `${directoryPath}/android/app/src/main/java/${upperJavaPath}/MainActivity.`;
-const mainActivityPathJava = `${mainActivityPathBase}java`;
-const mainActivityPathKotlin = `${mainActivityPathBase}kt`;
-const useJava = fs.existsSync(mainActivityPathJava)
-const mainActivityPath = useJava ? mainActivityPathJava : mainActivityPathKotlin;
-const mainActivityFile = readFile(mainActivityPath);
-
-const semiColonCode = useJava ? ";" : "";
-const upperCode = `package ${packageName}${semiColonCode}`;
-const importCode1 = `${upperCode}\nimport android.view.MotionEvent${semiColonCode}`;
-const importCode2 = `${upperCode}\nimport com.acoustic.connect.android.connectmod.Connect${semiColonCode}`;
-
-const javaCode1 = `public boolean dispatchTouchEvent(MotionEvent e) {
-                    Connect.INSTANCE.dispatchTouchEvent(this, e);
-                    return super.dispatchTouchEvent(e);
-                }`;
-const javaCode2 = `Connect.INSTANCE.dispatchTouchEvent(this, e);
-                   return super.dispatchTouchEvent(e);`;
-
-const kotlinCode1 = `\noverride fun dispatchTouchEvent(e: MotionEvent?): Boolean {
-                      Connect.dispatchTouchEvent(this, e)
-                    return super.dispatchTouchEvent(e)
-                }`;
-const kotlinCode2 = `Connect.dispatchTouchEvent(this, e)
-                     return super.dispatchTouchEvent(e)`;
- 
-const code1 = useJava ? javaCode1 : kotlinCode1;
-const code2 = useJava ? javaCode2 : kotlinCode2;
-// Determine if we are using Java or Kotlin
-const prettierPluginKotlin = require("prettier-plugin-kotlin");
-
-// Determine the parser based on whether the file is Java or Kotlin
-const parser = useJava ? "java" : "kotlin";
-const plugins = useJava ? [javaPaserPlugin] : [prettierPluginKotlin];
-
-// Format the MainActivity file and setup to update file
-var updateMainActivityData = prettier.format(mainActivityFile, {
-  parser: parser,
-  plugins: plugins,
-  tabWidth: 4,
-});
-
-let updateMainActivity = false;
-
-console.log("useJava: " + useJava);
-console.log("parser: " + parser);
-
-// Look for import
-const regExImport1 = new RegExp("import android.view.MotionEvent", "g");
-if(!regExImport1.test(updateMainActivityData)){
-  updateMainActivity = true;
-  updateMainActivityData = updateMainActivityData.replace(upperCode,importCode1); 
-}
-
-const regExImport2 = new RegExp("import com.acoustic.connect.android.connectmod.Connect", "g");
-if(!regExImport2.test(updateMainActivityData)){
-  updateMainActivity = true;
-  updateMainActivityData = updateMainActivityData.replace(upperCode,importCode2); 
-}
-
-// Look for dispatchTouchEvent method
-const regExDispatchTouchEvent = new RegExp(/oolean dispatchTouchEvent/, "g");
-if (!regExDispatchTouchEvent.test(updateMainActivityData)) {
-  updateMainActivity = true;
-  // Add dispatchTouchEvent method with library call
-  updateMainActivityData = updateMainActivityData.slice(0, updateMainActivityData.lastIndexOf("}"));
-  updateMainActivityData = `${updateMainActivityData.substring(0, updateMainActivityData.length)}${code1} }`;
-}
-
-// Check if our call has been added in dispatchTouchEvent
-const regExConnectDispatchTouchEvent = useJava ? new RegExp(/Connect.INSTANCE.dispatchTouchEvent/, "g") : new RegExp(/Connect.dispatchTouchEvent/, "g");
-if (!regExConnectDispatchTouchEvent.test(updateMainActivityData)) {
-  updateMainActivity = true;
-  // Add Connect.INSTANCE.dispatchTouchEvent
-  updateMainActivityData = updateMainActivityData.replace(/return super.dispatchTouchEvent\(e\);/, code2);
-}
-
-// Update activity
-if (updateMainActivity) {
-  // // Format the MainActivity file and setup to update file
-  updateMainActivityData = prettier.format(updateMainActivityData, {
-    parser: parser,
-    plugins: plugins,
-    tabWidth: 4,
-    useTabs: false,
-    kotlinPlugin: {
-      alignMultilineComments: true
-    }
-  });
-
-  console.log("File to be saved:\n" + updateMainActivityData);
-
-  try {
-    fs.writeFileSync(mainActivityPath, updateMainActivityData);
-    console.log("Updated:" + mainActivityPath);
-  } catch (err) {
-    console.log("Error writing:" + mainActivityPath);
-    console.error(err);
-  }
-} else {
-  console.log("Update not needed for:" + mainActivityPath);
-}