@dashx/react-native 1.0.7 → 1.0.8

package/DashXReactNative.podspec

@@ -1,24 +1,45 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::Spec.new do |s|
   s.name         = "DashXReactNative"
   s.version      = package["version"]
   s.summary      = package["description"]
-  s.description  = <<-DESC
-                  @dashx/react-native
-                   DESC
-  s.homepage     = "https://github.com/github_account/@dashx/react-native"
-  # brief license entry:
-  s.license      = "MIT"
-  s.authors      = { "DashXDev" => "dev@dashx.com" }
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["author"]
+
   s.platforms    = { :ios => "12.0" }
   s.source       = { :git => "https://github.com/dashxhq/dashx-react-native.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,c,m,swift}"
+  s.source_files = "ios/**/*.{h,m,mm,swift}"
   s.requires_arc = true
 
-  s.dependency "DashX", "1.0.5"
-  s.dependency "React"
+  # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
+  # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
+  if respond_to?(:install_modules_dependencies, true)
+    install_modules_dependencies(s)
+  else
+    s.dependency "React-Core"
+
+    # Don't install the dependencies when we run `pod install` in the old architecture.
+    if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+      s.pod_target_xcconfig    = {
+          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+          "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+      }
+      s.dependency "React-Codegen"
+      s.dependency "RCT-Folly"
+      s.dependency "RCTRequired"
+      s.dependency "RCTTypeSafety"
+      s.dependency "ReactCommon/turbomodule/core"
+    end
+  end
+
+  s.dependency "DashX", "1.0.19"
+  s.dependency "React-RCTAppDelegate"
 end

package/android/build.gradle

@@ -2,8 +2,8 @@ import groovy.json.JsonSlurper
 
 buildscript {
     ext {
-        kotlinVersion = '1.6.0'
-        androidToolsVersion = '7.0.4'
+        kotlinVersion = '1.8.0'
+        androidToolsVersion = '7.1.1'
     }
 
     repositories {
@@ -29,12 +29,12 @@ def getVersionFromNpm() {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 31
-        compileSdkVersion 31
+        minSdkVersion 21
+        targetSdkVersion 33
+        compileSdkVersion 33
         versionCode 1
         versionName getVersionFromNpm()
 
@@ -43,6 +43,17 @@ android {
     lintOptions {
         abortOnError false
     }
+
+    packagingOptions {
+        pickFirst 'lib/arm64-v8a/libc++_shared.so'
+        pickFirst 'lib/arm64-v8a/libfbjni.so'
+        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+        pickFirst 'lib/armeabi-v7a/libfbjni.so'
+        pickFirst 'lib/x86/libc++_shared.so'
+        pickFirst 'lib/x86/libfbjni.so'
+        pickFirst 'lib/x86_64/libc++_shared.so'
+        pickFirst 'lib/x86_64/libfbjni.so'
+   }
 }
 
 repositories {
@@ -55,6 +66,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${project.ext.kotlinVersion}"
     implementation 'com.facebook.react:react-native:+'
     implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0'
 
-    implementation "com.dashx:dashx-android:1.0.8"
+    implementation "com.dashx:dashx-android:1.0.13"
 }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Mon Oct 30 16:24:27 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/src/main/java/com/dashx/rn/sdk/DashXReactNativeModule.kt

@@ -4,14 +4,16 @@ import android.content.pm.PackageInfo
 import android.content.pm.PackageManager.NameNotFoundException
 import android.net.Uri
 import com.dashx.rn.sdk.util.*
+import com.dashx.sdk.DashXClient as DashX
 import com.dashx.sdk.DashXLog
-import com.dashx.sdk.data.ExternalAsset
+import com.dashx.sdk.DashXLog.LogLevel
 import com.dashx.sdk.data.LibraryInfo
 import com.facebook.react.bridge.*
-import com.google.gson.Gson
 import java.io.File
-import com.dashx.sdk.DashXClient as DashX
-
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
 
 class DashXReactNativeModule(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
     private val tag = DashXReactNativeModule::class.java.simpleName
@@ -22,7 +24,8 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
     }
 
     @ReactMethod
-    fun setLogLevel(logLevel: Int) {
+    fun setLogLevel(level: Int) {
+        val logLevel = LogLevel.values().firstOrNull { it.code == level } ?: LogLevel.OFF
         DashXLog.setLogLevel(logLevel)
     }
 
@@ -56,7 +59,7 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
     @ReactMethod
     fun track(event: String, data: ReadableMap?) {
         val jsonData = try {
-            data?.toHashMap() as HashMap<String, String>
+            data?.toHashMap() as HashMap<String, String>?
         } catch (e: Exception) {
             DashXLog.d(tag, e.message)
             return
@@ -83,7 +86,7 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
                 promise.reject("EUNSPECIFIED", it)
             },
             onSuccess = {
-                promise.resolve(convertJsonToMap(it))
+                promise.resolve(convertJsonToMap(convertKJsonToJson(it)))
             }
         )
     }
@@ -107,8 +110,8 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
         dashXClient?.searchContent(
             contentType,
             options?.getString("returnType") ?: "all",
-            jsonFilter,
-            jsonOrder,
+            convertJsonToKJson(jsonFilter),
+            convertJsonToKJson(jsonOrder),
             options?.getIntIfPresent("limit"),
             options?.getBooleanIfPresent("preview"),
             options?.getStringIfPresent("language"),
@@ -121,7 +124,7 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
             onSuccess = { content ->
                 val readableArray = Arguments.createArray()
                 content.forEach {
-                    readableArray.pushMap(convertJsonToMap(it))
+                    readableArray.pushMap(convertJsonToMap(convertKJsonToJson(it)))
                 }
                 promise.resolve(readableArray)
             }
@@ -149,12 +152,12 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
             pricingId,
             quantity,
             reset ?: false,
-            jsonCustom,
+            convertJsonToKJson(jsonCustom),
             onError = {
                 promise.reject("EUNSPECIFIED", it)
             },
             onSuccess = { content ->
-                promise.resolve(convertJsonToMap(content))
+                promise.resolve(convertJsonToMap(convertKJsonToJson(Json.decodeFromString<JsonObject>(Json.encodeToString(content)))))
             }
         )
     }
@@ -166,7 +169,7 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
                 promise.reject("EUNSPECIFIED", it)
             },
             onSuccess = { content ->
-                promise.resolve(convertJsonToMap(content))
+                promise.resolve(convertJsonToMap(convertKJsonToJson(Json.decodeFromString<JsonObject>(Json.encodeToString(content)))))
             }
         )
     }
@@ -178,7 +181,7 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
                 promise.reject("EUNSPECIFIED", it)
             },
             onSuccess = { content ->
-                promise.resolve(convertJsonToMap(content))
+                promise.resolve(convertJsonToMap(convertKJsonToJson(Json.decodeFromString<JsonObject>(Json.encodeToString(content)))))
             }
         )
     }
@@ -188,58 +191,38 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
         val preferencesString = MapUtil.toJSONElement(preferenceData).toString()
 
         dashXClient?.saveStoredPreferences(
-            preferencesString,
+            Json.decodeFromString<JsonObject>(preferencesString),
             onError = {
                 promise.reject("EUNSPECIFIED", it)
             },
             onSuccess = { content ->
-                promise.resolve(convertJsonToMap(content))
+                promise.resolve(convertJsonToMap(convertKJsonToJson(Json.decodeFromString<JsonObject>(Json.encodeToString(content)))))
             }
         )
     }
 
     @ReactMethod
-    fun uploadExternalAsset(
-        file: ReadableMap,
-        externalColumnId: String,
-        promise: Promise
-    ) {
-        val jsonFile = try {
-            convertMapToJson(file)
-        } catch (e: Exception) {
-            DashXLog.d(tag, e.message)
-            throw Exception("Encountered an error while parsing file")
-        }
-
-        // Remove unnecessary double quotes from RN URI
-        val filePath = getFilePathFromURIString(jsonFile?.get("uri").toString())
-        val fileObject = File(filePath)
-
-        dashXClient?.uploadExternalAsset(
-            fileObject,
-            externalColumnId,
-            onError = {
-                promise.reject("EUNSPECIFIED", it)
-            },
-            onSuccess = { content ->
-                val jsonObject = Gson().toJsonTree(content, ExternalAsset::class.java).asJsonObject
-                promise.resolve(convertJsonToMap(jsonObject))
-            }
-        )
+    fun subscribe() {
+        dashXClient?.subscribe()
     }
 
     @ReactMethod
-    fun subscribe() {
-        dashXClient?.subscribe()
+    fun unsubscribe() {
+        dashXClient?.unsubscribe()
     }
 
     //FIXME Amend the logic to work with React Native content URIs
     fun getFilePathFromURIString(contentUriString: String): String {
         val sanitizedURI = contentUriString.replace("\"", "")
         val path = Uri.parse(sanitizedURI).path
+        val index = path?.indexOf(':')
+
+        if (index == null) {
+            return ""
+        }
 
         // Remove unnecessary URI component
-        val filePath = path!!.substring(path?.indexOf(':') + 1)
+        val filePath = path!!.substring(index!! + 1)
 
         return filePath
     }

package/android/src/main/java/com/dashx/rn/sdk/util/Utils.kt

@@ -3,9 +3,28 @@
 package com.dashx.rn.sdk.util
 
 import com.facebook.react.bridge.*
+import com.google.gson.Gson
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject as KJsonObject
 import org.json.JSONException
+import kotlinx.serialization.decodeFromString
+
+fun convertKJsonToJson(kotlinxJsonObject: KJsonObject): JsonObject {
+    val jsonString = Json.encodeToString(kotlinxJsonObject)
+    return Gson().fromJson(jsonString, JsonObject::class.java)
+}
+
+fun convertJsonToKJson(jsonObject: JsonObject?): KJsonObject? {
+    if (jsonObject == null) {
+        return null
+    }
+
+    val jsonString = jsonObject.toString()
+    return Json.decodeFromString(jsonString)
+}
 
 @Throws(JSONException::class)
 fun convertMapToJson(readableMap: ReadableMap?): JsonObject? {
@@ -128,4 +147,4 @@ fun ReadableMap.getStringIfPresent(key: String): String? {
 
 fun ReadableMap.getBooleanIfPresent(key: String): Boolean? {
     return if (this.hasKey(key)) this.getBoolean(key) else null
-}
+}

package/index.js

@@ -1,85 +1,78 @@
-import { NativeEventEmitter, NativeModules } from "react-native";
-import { parseFilterObject, toContentSingleton } from "./utils";
-import { getRealPathFromURI } from "react-native-get-real-path";
-
-import ContentOptionsBuilder from "./ContentOptionsBuilder";
-
-const { DashXReactNative: DashX } = NativeModules;
-
-const dashXEventEmitter = new NativeEventEmitter(DashX);
+import { NativeModules, Platform } from 'react-native';
+
+const LINKING_ERROR =
+  `The package 'dashx-react-native' doesn't seem to be linked. Make sure: \n\n` +
+  Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
+  '- You rebuilt the app after installing the package\n' +
+  '- You are not using Expo Go\n';
+
+const DashX = NativeModules.DashXReactNative
+  ? NativeModules.DashXReactNative
+  : new Proxy(
+    {},
+    {
+      get() {
+        throw new Error(LINKING_ERROR);
+      },
+    }
+  );
 
 const {
-	identify,
-	setIdentity,
-	track,
-	fetchContent,
-	searchContent,
-	uploadExternalAsset,
-	prepareExternalAsset,
-	externalAsset,
-	fetchStoredPreferences,
-	saveStoredPreferences,
+  configure,
+  identify,
+  setIdentity,
+  reset,
+  track,
+  screen,
+  fetchStoredPreferences,
+  saveStoredPreferences,
+  subscribe,
+  unsubscribe,
+  setLogLevel,
 } = DashX;
 
+DashX.configure = (options) => {
+  return configure(options);
+}
+
 DashX.identify = (options) => {
-	return identify(options);
+  return identify(options);
 };
 
 DashX.setIdentity = (uid, token) => {
-	return setIdentity(uid, token);
-};
-
-DashX.track = (event, data) => track(event, data || null);
-
-DashX.searchContent = (contentType, options) => {
-	if (!options) {
-		return new ContentOptionsBuilder((wrappedOptions) =>
-			searchContent(contentType, wrappedOptions)
-		);
-	}
-
-	const filter = parseFilterObject(options.filter);
-
-	const result = searchContent(contentType, { ...options, filter });
-
-	if (options.returnType === "all") {
-		return result;
-	}
-
-	return result.then(toContentSingleton);
-};
-
-DashX.fetchContent = (contentType, options) => {
-	return fetchContent(contentType, options);
+  return setIdentity(uid, token);
 };
 
-DashX.uploadExternalAsset = async (file, externalColumnId) => {
-  // Convert content uri to file uri
-  if (file.uri.startsWith("content://")) {
-    file.uri = `file://${await getRealPathFromURI(file.uri)}`;
-  }
-
-  return uploadExternalAsset(file, externalColumnId);
-};
+DashX.reset = () => {
+  return reset();
+}
 
-DashX.prepareExternalAsset = (externalColumnId) => {
-	return prepareExternalAsset(externalColumnId);
-};
+DashX.track = (event, data) => {
+  return track(event, data || null);
+}
 
-DashX.externalAsset = (assetId) => {
-	return externalAsset(assetId);
-};
+DashX.screen = (screenName, data) => {
+  return screen(screenName, data || null)
+}
 
 DashX.fetchStoredPreferences = () => {
-	return fetchStoredPreferences();
+  return fetchStoredPreferences();
 };
 
 DashX.saveStoredPreferences = (preferenceData) => {
-	return saveStoredPreferences(preferenceData);
+  return saveStoredPreferences(preferenceData);
 };
 
-DashX.onMessageReceived = (callback) => {
-	dashXEventEmitter.addListener("messageReceived", callback);
-};
+DashX.subscribe = () => {
+  return subscribe();
+}
+
+DashX.unsubscribe = () => {
+  return unsubscribe();
+}
+
+DashX.setLogLevel = (level) => {
+  return setLogLevel(level);
+}
 
 export default DashX;

package/ios/DashXEventEmitter.swift

@@ -1,12 +1,10 @@
-import Foundation
-
 class DashXEventEmitter {
     static let instance = DashXEventEmitter()
-    private static var eventEmitter: RCTEventEmitter!
+    private static var eventEmitter: DashXReactNative!
 
     private init() {}
 
-    func registerEventEmitter(eventEmitter: RCTEventEmitter) {
+    func registerEventEmitter(eventEmitter: DashXReactNative) {
         DashXEventEmitter.eventEmitter = eventEmitter
     }
 

package/ios/DashXRCTAppDelegate.h

@@ -0,0 +1,3 @@
+#import <UIKit/UIKit.h>
+#import <React/RCTBundleURLProvider.h>
+#import <React_RCTAppDelegate/RCTAppDelegate.h>