@dashx/react-native 1.0.7 → 1.1.0

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>

package/ios/DashXRCTAppDelegate.swift

@@ -0,0 +1,200 @@
+import FirebaseCore
+import FirebaseMessaging
+import Foundation
+import UIKit
+import DashX
+
+@objc(DashXRCTAppDelegate)
+open class DashXRCTAppDelegate: RCTAppDelegate, MessagingDelegate, UNUserNotificationCenterDelegate {
+    // MARK: Getters
+    private var app: UIApplication = .shared
+
+    // MARK: Init
+
+    public override init() {
+        super.init()
+
+        UNUserNotificationCenter.current().delegate = self
+
+        // Register to ensure device token can be fetched
+        app.registerForRemoteNotifications()
+    }
+
+    // MARK: MessagingDelegate
+
+    open override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        FirebaseApp.configure()
+        Messaging.messaging().delegate = self
+
+        // Requesting Push Notifications Permission
+        DashX.requestNotificationPermission { authorizationStatus in
+            switch authorizationStatus {
+            case .authorized:
+                DashXLog.d(tag: #function, "permission authorized to receive push notifications")
+            default:
+                DashXLog.d(tag: #function, "permission denied to receive push notifications")
+            }
+        }
+
+        return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+    }
+
+    // MARK: - APNS Token Management
+
+    public override func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
+        DashXLog.d(tag: #function, "Unable to register for remote notifications: \(error.localizedDescription)")
+    }
+
+    public override func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+        Messaging.messaging().setAPNSToken(deviceToken, type: .unknown)
+    }
+
+    public func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) {
+        guard let token = fcmToken else {
+            DashXLog.d(tag: #function, "FCM Token is empty")
+            return
+        }
+
+        DashXLog.d(tag: #function, "FCM Token: \(token)")
+
+        DashX.setFCMToken(to: token)
+    }
+
+    // MARK: - Push Notifications
+
+    public func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
+        let message = notification.request.content.userInfo
+
+        // Pass notification reciept information to Firebase
+        Messaging.messaging().appDidReceiveMessage(message)
+
+        DashX.trackNotification(message: message, event: .delivered)
+
+        let presentationOptions = notificationDeliveredInForeground(message: message)
+
+        completionHandler(presentationOptions)
+    }
+
+    public func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
+        let message = response.notification.request.content.userInfo
+
+        // Pass notification reciept information to Firebase
+        Messaging.messaging().appDidReceiveMessage(message)
+
+        if response.actionIdentifier == UNNotificationDismissActionIdentifier {
+            DashX.trackNotification(message: message, event: .dismissed)
+        } else {
+            DashX.trackNotification(message: message, event: .clicked)
+
+            if let url = message.dashxNotificationUrl() {
+                handleLink(url: url)
+            } else {
+                notificationClicked(message: message, actionIdentifier: response.actionIdentifier)
+            }
+        }
+
+        completionHandler()
+    }
+
+    public override func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
+        // Pass notification reciept information to Firebase
+        Messaging.messaging().appDidReceiveMessage(userInfo)
+
+        guard let dashxData = userInfo.dashxNotificationData() else {
+            DashXLog.d(tag: #function, "Unable to parse DashX notification data")
+            completionHandler(.failed)
+            return
+        }
+
+        let notificationContent = UNMutableNotificationContent()
+        notificationContent.sound = UNNotificationSound.default
+        notificationContent.title = dashxData.title
+        notificationContent.body = dashxData.body
+        notificationContent.userInfo = userInfo
+        notificationContent.categoryIdentifier = Constants.DASHX_NOTIFICATION_CATEGORY_IDENTIFIER
+
+        var notificationActions: [UNNotificationAction] = []
+
+        if let actionButtons = dashxData.actionButtons {
+            for button in actionButtons {
+                notificationActions.append(
+                    UNNotificationAction(
+                        identifier: button.identifier,
+                        title: button.label,
+                        options: [.foreground]
+                    )
+                )
+            }
+        }
+
+        let notificationCategory = UNNotificationCategory(
+            identifier: Constants.DASHX_NOTIFICATION_CATEGORY_IDENTIFIER,
+            actions: notificationActions,
+            intentIdentifiers: [],
+            options: .customDismissAction
+        )
+
+        UNUserNotificationCenter.current().setNotificationCategories([notificationCategory])
+
+        if let imagePath = dashxData.image,
+           let imageURL = URL(string: imagePath)
+        {
+            createNotificationWithImage(id: dashxData.id, imageURL: imageURL, content: notificationContent)
+        } else {
+            createNotification(id: dashxData.id, content: notificationContent)
+        }
+
+        completionHandler(.newData)
+    }
+
+    // MARK: - Push Notifications handlers
+
+    open func notificationDeliveredInForeground(message: [AnyHashable: Any]) -> UNNotificationPresentationOptions { return [] }
+
+    open func notificationClicked(message: [AnyHashable: Any], actionIdentifier: String) {}
+
+    open func handleLink(url: URL) {}
+}
+
+extension DashXRCTAppDelegate {
+    private func createNotification(id: String, content: UNMutableNotificationContent) {
+        let request = UNNotificationRequest(identifier: id, content: content, trigger: nil)
+
+        UNUserNotificationCenter.current().add(request) { error in
+            if let error = error {
+                DashXLog.d(tag: #function, "Failed to schedule notification request: \(error.localizedDescription)")
+            } else {
+                DashXLog.d(tag: #function, "Notification request added successfully.")
+            }
+        }
+    }
+
+    private func createNotificationWithImage(id: String,
+                                             imageURL: URL,
+                                             content: UNMutableNotificationContent)
+    {
+        let task = URLSession.shared.downloadTask(with: imageURL) { location, _, error in
+            guard let location = location, error == nil else {
+                return
+            }
+
+            // Create a temporary file URL to save the downloaded image
+            let tmpDirectoryURL = FileManager.default.temporaryDirectory
+            let uuid = UUID().uuidString
+            let tmpFileURL = tmpDirectoryURL.appendingPathComponent(uuid + ".png")
+
+            do {
+                // Move the downloaded file to the temporary file URL
+                try FileManager.default.moveItem(at: location, to: tmpFileURL)
+
+                // Create the notification attachment from the temporary file URL
+                let attachment = try UNNotificationAttachment(identifier: "\(id)-attachment", url: tmpFileURL, options: nil)
+                content.attachments = [attachment]
+                self.createNotification(id: id, content: content)
+            } catch {
+                DashXLog.d(tag: #function, "Error moving file: \(error.localizedDescription)")
+            }
+        }
+        task.resume()
+    }
+}

package/ios/DashXReactNative-Bridging-Header.h

@@ -1,4 +1,3 @@
-//
-//  Use this file to import your target's public headers that you would like to expose to Swift.
-//
-
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+#import <React/RCTViewManager.h>

package/ios/DashXReactNative.mm

@@ -0,0 +1,28 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+
+@interface RCT_EXTERN_MODULE(DashXReactNative, RCTEventEmitter)
+
+RCT_EXTERN_METHOD(configure:(NSDictionary *)options);
+
+RCT_EXTERN_METHOD(identify:(NSDictionary *)options);
+
+RCT_EXTERN_METHOD(setIdentity:(NSString *)uid token:(NSString *)token);
+
+RCT_EXTERN_METHOD(track:(NSString *)event data:(NSDictionary * _Nullable)data);
+
+RCT_EXTERN_METHOD(screen:(NSString *)screenName data:(NSDictionary * _Nullable)data);
+
+RCT_EXTERN_METHOD(fetchStoredPreferences:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
+
+RCT_EXTERN_METHOD(saveStoredPreferences:(NSDictionary *)preferenceData resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
+
+RCT_EXTERN_METHOD(reset);
+
+RCT_EXTERN_METHOD(subscribe);
+
+RCT_EXTERN_METHOD(unsubscribe);
+
+RCT_EXTERN_METHOD(setLogLevel:(int *)level);
+
+@end

package/ios/DashXReactNative.swift

@@ -0,0 +1,105 @@
+import Foundation
+import DashX
+
+typealias CBU = CallbackUtils
+
+@objc(DashXReactNative)
+class DashXReactNative: RCTEventEmitter {
+    override init() {
+        super.init()
+        DashXEventEmitter.instance.registerEventEmitter(eventEmitter: self)
+    }
+
+    override static func requiresMainQueueSetup() -> Bool {
+        return true
+    }
+
+    override func supportedEvents() -> [String] {
+        return ["messageReceived"]
+    }
+
+    @objc(configure:)
+    func configure(_ options: NSDictionary) {
+        let publicKey = options["publicKey"] as! String,
+            baseURI = options["baseURI"] as? String,
+            targetEnvironment = options["targetEnvironment"] as? String
+
+        DashX.configure(
+            withPublicKey: publicKey,
+            baseURI: baseURI,
+            targetEnvironment: targetEnvironment
+        )
+    }
+
+    @objc(identify:)
+    func identify(_ options: NSDictionary) {
+        try? DashX.identify(withOptions: options)
+    }
+
+    @objc(setIdentity:token:)
+    func setIdentity(_ uid: String, _ token: String) {
+        DashX.setIdentity(uid: uid, token: token)
+    }
+
+    @objc
+    func reset() {
+        DashX.reset()
+    }
+
+    @objc(track:data:)
+    func track(_ event: String, _ data: NSDictionary?) {
+        DashX.track(event, withData: data)
+    }
+
+    @objc(screen:data:)
+    func screen(_ screenName: String, _ data: NSDictionary?) {
+        DashX.screen(screenName, withData: data)
+    }
+
+    @objc(fetchStoredPreferences:rejecter:)
+    func fetchStoredPreferences(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+        DashX.fetchStoredPreferences(
+            successCallback: CBU.resolveToSuccessCallback(resolve),
+            failureCallback: CBU.rejectToFailureCallback(reject)
+        )
+    }
+
+    @objc(saveStoredPreferences:resolve:rejecter:)
+    func saveStoredPreferences(_ preferenceData: NSDictionary, _ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+        DashX.saveStoredPreferences(
+            preferenceData: preferenceData,
+            successCallback: CBU.resolveToSuccessCallback(resolve),
+            failureCallback: CBU.rejectToFailureCallback(reject)
+        )
+    }
+
+    @objc
+    func subscribe() {
+        DashX.subscribe()
+    }
+
+    @objc
+    func unsubscribe() {
+        DashX.unsubscribe()
+    }
+
+    @objc(setLogLevel:)
+    func setLogLevel(_ level: Int) {
+        let logLevel = DashXLog.LogLevel(rawValue: level) ?? DashXLog.LogLevel.off
+        DashXLog.setLogLevel(to: logLevel)
+    }
+}
+
+class CallbackUtils {
+    static func resolveToSuccessCallback(_ resolve: @escaping RCTPromiseResolveBlock) -> SuccessCallback {
+        return resolve
+    }
+
+    static func rejectToFailureCallback(_ reject: @escaping RCTPromiseRejectBlock) -> FailureCallback {
+        let result: FailureCallback = { (error) in
+            reject("\((error as NSError).code)", error.localizedDescription, error)
+        }
+
+        return result
+    }
+}

package/ios/DashXReactNative.xcodeproj/project.pbxproj

@@ -7,9 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		7C3CFED5289B9C6E00D184AB /* DashX.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C3CFED3289B9C6E00D184AB /* DashX.swift */; };
-		7C3CFED6289B9C6E00D184AB /* DashXEventEmitter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C3CFED4289B9C6E00D184AB /* DashXEventEmitter.swift */; };
-		B3E7B58A1CC2AC0600A0062D /* DashXReactNative.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* DashXReactNative.m */; };
+		5124AEE72A7A25120079E503 /* DashXReactNative.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* DashXReactNative.m */; };
+		5124AEE82A7A25120079E503 /* DashX.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C3CFED3289B9C6E00D184AB /* DashX.swift */; };
+		5124AEE92A7A25120079E503 /* DashXEventEmitter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C3CFED4289B9C6E00D184AB /* DashXEventEmitter.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -122,9 +122,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7C3CFED5289B9C6E00D184AB /* DashX.swift in Sources */,
-				7C3CFED6289B9C6E00D184AB /* DashXEventEmitter.swift in Sources */,
-				B3E7B58A1CC2AC0600A0062D /* DashXReactNative.m in Sources */,
+				5124AEE72A7A25120079E503 /* DashXReactNative.m in Sources */,
+				5124AEE82A7A25120079E503 /* DashX.swift in Sources */,
+				5124AEE92A7A25120079E503 /* DashXEventEmitter.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

package/package.json

@@ -1,17 +1,30 @@
 {
   "name": "@dashx/react-native",
   "title": "DashX React Native",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "description": "DashX SDK for React Native",
   "main": "index.js",
   "files": [
-    "README.md",
+    "!**/__fixtures__",
+    "!**/__mocks__",
+    "!**/__tests__",
+    "!**/.*",
+    "!android/build",
+    "!android/gradle",
+    "!android/gradlew.bat",
+    "!android/gradlew",
+    "!android/local.properties",
+    "!ios/build",
+    "!lib/typescript/example",
+    "*.podspec",
     "android",
-    "index.js",
     "ContentOptionsBuilder.js",
-    "utils.js",
+    "cpp",
+    "DashXReactNative.podspec",
+    "index.js",
     "ios",
-    "DashXReactNative.podspec"
+    "README.md",
+    "utils.js"
   ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -21,7 +34,9 @@
     "url": "https://github.com/dashxhq/dashx-react-native"
   },
   "keywords": [
-    "react-native"
+    "react-native",
+    "ios",
+    "android"
   ],
   "author": {
     "name": "DashXDev",
@@ -29,14 +44,61 @@
   },
   "license": "MIT",
   "licenseFilename": "LICENSE",
+  "homepage": "https://github.com/dashxhq/dashx-react-native#readme",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
   "peerDependencies": {
-    "react-native": "^0.41.2"
+    "react": "*",
+    "react-native": "*"
   },
   "devDependencies": {
-    "eslint": "^8.21.0",
-    "eslint-plugin-react": "^7.30.1"
+    "@commitlint/config-conventional": "^17.0.2",
+    "@react-native/eslint-config": "0.77.3",
+    "del-cli": "^5.0.0",
+    "eslint": "^8.4.1",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "jest": "^28.1.1",
+    "pod-install": "^0.1.0",
+    "prettier": "^2.0.5",
+    "react": "18.3.1",
+    "react-native": "0.77.3",
+    "react-native-builder-bob": "^0.21.3",
+    "turbo": "^1.10.7"
+  },
+  "engines": {
+    "node": ">= 16.0.0"
   },
   "dependencies": {
     "react-native-get-real-path": "github:Wraptime/react-native-get-real-path"
+  },
+  "eslintConfig": {
+    "root": true,
+    "extends": [
+      "@react-native",
+      "prettier"
+    ],
+    "rules": {
+      "prettier/prettier": [
+        "error",
+        {
+          "quoteProps": "consistent",
+          "singleQuote": true,
+          "tabWidth": 2,
+          "trailingComma": "es5",
+          "useTabs": false
+        }
+      ]
+    }
+  },
+  "eslintIgnore": [
+    "node_modules/",
+    "lib/"
+  ],
+  "prettier": {
+    "quoteProps": "consistent",
+    "singleQuote": true,
+    "trailingComma": "es5"
   }
 }