@sentiance-react-native/core 6.4.0-rc.3 → 6.4.0

package/{ios/RNSentianceCore.podspec → RNSentianceCore.podspec}

@@ -1,10 +1,10 @@
 require 'json'
-package = JSON.parse(File.read(File.join(__dir__, '../package.json')))
+package = JSON.parse(File.read(File.join(__dir__, './package.json')))
 sentiance_sdk_version = package['sdkVersions']['ios']['sentiance']
 
 Pod::Spec.new do |s|
   s.name         = "RNSentianceCore"
-  s.version      = "6.4.0-rc.3"
+  s.version      = "6.4.0"
   s.summary      = "RNSentianceCore"
   s.description  = <<-DESC
                    RNSentianceCore
@@ -14,8 +14,8 @@ Pod::Spec.new do |s|
   # s.license    = { :type => "MIT", :file => "FILE_LICENSE" }
   s.author       = { "author" => "sdk@sentiance.com" }
   s.platform     = :ios, "9.0"
-  s.source       = { :git => "https://github.com/sentiance/react-native-sentiance.git", :tag => "master" }
-  s.source_files = "*.{h,m}"
+  s.source       = { :git => "https://github.com/sentiance/react-native-sentiance.git", :tag => "v#{s.version}" }
+  s.source_files = "ios/*.{h,m}"
   s.requires_arc = true
   s.xcconfig     = { 'FRAMEWORK_SEARCH_PATHS' => '${PODS_ROOT}/SENTSDK' }
 

package/ios/RNSentianceCore.h

@@ -2,6 +2,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
 #import <SENTSDK/SENTSDK.h>
+#import <SENTSDK/SENTSDK-Swift.h>
 
 static NSString * _Nonnull const UserLinkEvent = @"SENTIANCE_USER_LINK_EVENT";
 static NSString * _Nonnull const SdkStatusUpdateEvent = @"SENTIANCE_STATUS_UPDATE_EVENT";

package/lib/SentianceEventEmitter.js

@@ -8,6 +8,7 @@ class SentianceEventEmitter extends NativeEventEmitter {
     const bindings = this.requireNativeBindings(nativeModule);
     this._addNativeListener = bindings.addNativeListener;
     this._removeNativeListener = bindings.removeNativeListener;
+    this._subscriptionsMap = {};
   }
 
   requireNativeBindings(nativeModule) {
@@ -32,16 +33,31 @@ class SentianceEventEmitter extends NativeEventEmitter {
   }
 
   async addListener(eventType, listener, context): EmitterSubscription {
+    if (!this._subscriptionsMap[eventType]) {
+      this._subscriptionsMap[eventType] = [];
+    }
+    const subscriptionsForType = this._subscriptionsMap[eventType];
+    const key = subscriptionsForType.length;
     const subscription = super.addListener(eventType, listener, context);
-    await this._addNativeListener(eventType, subscription.key);
+    subscription.key = key;
+    subscriptionsForType.push(subscription);
+    await this._addNativeListener(eventType, key);
     return subscription;
   }
 
   async clearSubscription(eventType, subscription) {
+    const key = subscription.key;
+    const subscriptionsForType = this._subscriptionsMap[eventType];
+    if (subscriptionsForType) {
+      const targetSubIndex = subscriptionsForType.findIndex(sub => sub.key === key);
+      if (targetSubIndex !== -1) {
+        subscriptionsForType.splice(targetSubIndex, 1);
+      }
+    }
     if (super.removeSubscription != null) {
       super.removeSubscription(subscription);
     } else {
-      // RN 0.64+ no longer provides a removeSubscription function
+      // RN 0.65+ no longer provides a removeSubscription function
       subscription.remove();
     }
     await this._removeNativeListener(eventType, subscription.key);

package/lib/SentianceEventListenerUtils.js

@@ -5,8 +5,9 @@ exports.createEventListener = async (eventName: String, emitter: SentianceEventE
     callback(data);
   };
   const subscription = await emitter.addListener(eventName, listener);
-  subscription.remove = async function () {
-    await emitter.clearSubscription(eventName, subscription);
-  }
-  return subscription;
-};
+  return {
+    key: subscription.key,
+    eventName,
+    remove: () => emitter.clearSubscription(eventName, subscription)
+  };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentiance-react-native/core",
-  "version": "6.4.0-rc.3",
+  "version": "6.4.0",
   "description": "React Native Sentiance core library",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",