From 3479fdf5b8f78813dc649eff23a63b07fc4dc37f Mon Sep 17 00:00:00 2001
From: Milos Vasic <milos.vasic@harness.io>
Date: Wed, 29 Sep 2021 15:31:23 +0300
Subject: [PATCH 1/9] FFM-1424 - Working on SSE support.

---
 .gitignore                                    |   2 +-
 README.md                                     |   9 +-
 android/.idea/gradle.xml                      |   3 +-
 android/.idea/jarRepositories.xml             |  15 +
 android/.idea/modules.xml                     |   8 -
 android/build.gradle                          |  70 +++-
 .../com/clientsdk/ClientNativeModule.java     | 152 +++++--
 .../com/clientsdk/ClientNativePackage.java    |  13 +-
 index.ts                                      | 373 ++++++++++--------
 ios/ReactNativePlugin.swift                   |  29 +-
 package.json                                  |   2 +-
 11 files changed, 420 insertions(+), 256 deletions(-)
 delete mode 100644 android/.idea/modules.xml

diff --git a/.gitignore b/.gitignore
index 94520e0..0965f31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -319,4 +319,4 @@ Temporary Items
 .idea
 package-lock.json
 
-.DS_Store
+yarn.lock
diff --git a/README.md b/README.md
index b365716..eecf8b6 100644
--- a/README.md
+++ b/README.md
@@ -20,9 +20,10 @@ To sign up, https://app.harness.io/auth/#/signup/
 ## _Setup_
 
 To install SDK, declare a dependency to project's `package.json` file:
-```JSON
-"ff-react-native-client-sdk": "1.0.0",
 ```
+"ff-react-native-client-sdk": "1.0.0"
+```
+
 Or using npm install: 
 ```shell
 $ npm install --save ff-react-native-client-sdk
@@ -76,7 +77,7 @@ The Public API exposes a few methods that you can utilize:
 
 * `jsonVariation(evalutionId: string, defaultValue: any)`
 
-* `registerEventsListener(listener: (type: string, flags: any) => void) `
+* `registerListener(listener: (type: string, flags: any) => void) `
 
 * `unregisterListener(listener: (type: string, flags: any) => void)`
 
@@ -116,7 +117,7 @@ let jsonEvaluation = await client.jsonVariation("demo_json_evaluation", {});
 This method provides a way to register a listener for different events that might be triggered by SDK, indicating specific change in SDK itself.
 
 ```JavaScript
-    client.registerEventsListener((type, flags) => {
+    client.registerListener((type, flags) => {
 
     });
 ```
diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
index c2acdd9..a996a1b 100644
--- a/android/.idea/gradle.xml
+++ b/android/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$USER_HOME$/.gradle/wrapper/dists/gradle-6.1.1-all/cfmwm155h49vnt3hynmlrsdst/gradle-6.1.1" />
@@ -15,7 +15,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/android/.idea/jarRepositories.xml b/android/.idea/jarRepositories.xml
index f822c49..b0230ae 100644
--- a/android/.idea/jarRepositories.xml
+++ b/android/.idea/jarRepositories.xml
@@ -51,5 +51,20 @@
       <option name="name" value="maven4" />
       <option name="url" value="file:/$PROJECT_DIR$/../node_modules/react-native-screens/node_modules/react-native/android" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="file:$PROJECT_DIR$/../node_modules/jsc-android/dist/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="file:$PROJECT_DIR$/../node_modules/react-native/android/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:$USER_HOME$/.m2/repository/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/android/.idea/modules.xml b/android/.idea/modules.xml
deleted file mode 100644
index aa2df26..0000000
--- a/android/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/clientSdk.iml" filepath="$PROJECT_DIR$/.idea/modules/clientSdk.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index 65bde3d..8db9fec 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,23 +1,55 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+
     ext {
+
         buildToolsVersion = "29.0.2"
         minSdkVersion = 19
         compileSdkVersion = 29
         targetSdkVersion = 29
     }
+
     repositories {
+
         google()
-        jcenter()
+        mavenCentral()
+        maven { url 'https://www.jitpack.io' }
     }
+
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.3")
+
+        classpath("com.android.tools.build:gradle:3.5.4")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
+allprojects {
+
+    repositories {
+
+        mavenLocal()
+
+        maven {
+
+            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+            url("$rootDir/../node_modules/react-native/android")
+        }
+
+        maven {
+
+            // Android JSC is installed from npm
+            url("$rootDir/../node_modules/jsc-android/dist")
+        }
+
+        mavenCentral()
+        google()
+        maven { url 'https://www.jitpack.io' }
+        jcenter()
+    }
+}
+
 apply plugin: 'com.android.library'
 
 android {
@@ -38,6 +70,19 @@ android {
         versionCode 1
         versionName "1.0"
     }
+
+    buildTypes {
+
+        debug {
+
+            debuggable true
+        }
+
+        release {
+
+            debuggable true
+        }
+    }
 }
 
 dependencies {
@@ -45,24 +90,7 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     // noinspection GradleDynamicVersion
 
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation 'io.harness:ff-android-client-sdk:1.0.3'
+    api "com.facebook.react:react-native:0.63.2"  // From node_modules
+    api "io.harness:ff-android-client-sdk:1.0.3"
 }
 
-allprojects {
-    repositories {
-        mavenLocal()
-        maven {
-            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url("$rootDir/../node_modules/react-native/android")
-        }
-        maven {
-            // Android JSC is installed from npm
-            url("$rootDir/../node_modules/jsc-android/dist")
-        }
-
-        google()
-        jcenter()
-        maven { url 'https://www.jitpack.io' }
-    }
-}
diff --git a/android/src/main/java/com/clientsdk/ClientNativeModule.java b/android/src/main/java/com/clientsdk/ClientNativeModule.java
index d965c5a..c35fb6a 100644
--- a/android/src/main/java/com/clientsdk/ClientNativeModule.java
+++ b/android/src/main/java/com/clientsdk/ClientNativeModule.java
@@ -1,5 +1,7 @@
 package com.clientsdk;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.Arguments;
@@ -7,7 +9,6 @@
 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.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
@@ -15,10 +16,7 @@
 
 import org.json.JSONObject;
 
-import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 import io.harness.cfsdk.CfClient;
 import io.harness.cfsdk.CfConfiguration;
@@ -31,34 +29,48 @@
 import io.harness.cfsdk.cloud.oksse.model.StatusEvent;
 
 public class ClientNativeModule extends ReactContextBaseJavaModule {
+
     public ClientNativeModule(ReactApplicationContext reactContext) {
+
         super(reactContext);
     }
 
     @NonNull
     @Override
     public String getName() {
+
         return "ReactNativePlugin";
     }
 
     private WritableMap evaluationToMap(Evaluation evaluation) {
+
         WritableMap map = Arguments.createMap();
         map.putString("flag", evaluation.getFlag());
+
         if (evaluation.getValue() instanceof Boolean) {
+
             map.putBoolean("value", evaluation.getValue());
+
         } else if (evaluation.getValue() instanceof Number)
+
             map.putInt("value", ((Number) evaluation.getValue()).intValue());
-        else map.putString("value", evaluation.getValue().toString());
 
+        else {
+
+            map.putString("value", evaluation.getValue().toString());
+        }
         return map;
     }
 
-    private EventsListener listener = new EventsListener() {
+    private final EventsListener listener = statusEvent -> {
 
-        @Override
-        public void onEventReceived(StatusEvent statusEvent) {
+        System.out.println("On event received: " + statusEvent.getEventType());
 
+        try {
             if (statusEvent.getEventType() == StatusEvent.EVENT_TYPE.EVALUATION_RELOAD) {
+
+                System.out.println("On event received (1)");
+
                 List<Evaluation> list = statusEvent.extractPayload();
                 WritableArray array = Arguments.createArray();
                 for (Evaluation evaluation : list) {
@@ -66,24 +78,30 @@ public void onEventReceived(StatusEvent statusEvent) {
                     array.pushMap(map);
                 }
                 sendEvent("evaluation_polling", array);
+
             } else if (statusEvent.getEventType() == StatusEvent.EVENT_TYPE.EVALUATION_CHANGE) {
+
+                System.out.println("On event received (2)");
                 Evaluation evaluation = statusEvent.extractPayload();
                 WritableMap map = evaluationToMap(evaluation);
                 sendEvent("evaluation_change", map);
+
             } else if (statusEvent.getEventType() == StatusEvent.EVENT_TYPE.SSE_START) {
-                sendEvent("start", null);
+
+                System.out.println("On event received (3)");
+                sendEvent("start");
+
             } else if (statusEvent.getEventType() == StatusEvent.EVENT_TYPE.SSE_END) {
-                sendEvent("end", null);
+
+                System.out.println("On event received (4)");
+                sendEvent("end");
             }
+        } catch (IllegalStateException e) {
+
+            Log.e(getClass().getSimpleName(), e.getMessage(), e);
         }
     };
 
-    private void sendEvent(String type, Object data) {
-        getReactApplicationContext()
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit(type, data);
-    }
-
     @ReactMethod
     public void initialize(
 
@@ -92,16 +110,12 @@ public void initialize(
             ReadableMap targetMap,
             Promise callback
     ) {
+
         System.out.println("Native called init");
 
         CfConfiguration cfConfiguration = configurationFromMap(configurationMap);
         Target target = targetFromMap(targetMap);
 
-        if (listener != null) {
-
-            CfClient.getInstance().registerEventsListener(listener);
-        }
-
         CfClient.getInstance().initialize(
 
                 getReactApplicationContext(),
@@ -109,18 +123,21 @@ public void initialize(
                 cfConfiguration,
                 target,
 
-                new AuthCallback() {
+                (authInfo, result) -> {
+
+                    if (result.isSuccess()) {
 
-                    @Override
-                    public void authorizationSuccess(AuthInfo authInfo, AuthResult result) {
+                        if (CfClient.getInstance().registerEventsListener(listener)) {
 
-                        callback.resolve(result.isSuccess());
+                            System.out.println("Main React Native events listener has been registered");
+                        } else {
+
+                            System.out.println("Main React Native events listener has NOT been registered");
+                        }
                     }
-                });
-    }
 
-    @ReactMethod
-    public void registerEventsListener(Promise callback) {
+                    callback.resolve(result.isSuccess());
+                });
     }
 
     @ReactMethod
@@ -139,7 +156,6 @@ public void stringVariationWithFallback(String evaluationId, String defaultValue
         callback.resolve(map);
     }
 
-
     @ReactMethod
     public void boolVariation(String evaluationId, Promise callback) {
 
@@ -182,7 +198,12 @@ public void jsonVariation(String evaluationId, Promise callback) {
     }
 
     @ReactMethod
-    public void jsonVariationWithFallback(String evaluationId, ReadableMap dataMap, Promise callback) {
+    public void jsonVariationWithFallback(
+
+            String evaluationId,
+            ReadableMap dataMap,
+            Promise callback
+    ) {
 
         JSONObject defaultObject = new JSONObject(dataMap.toHashMap());
         JSONObject value = CfClient.getInstance().jsonVariation(evaluationId, defaultObject);
@@ -194,26 +215,46 @@ public void jsonVariationWithFallback(String evaluationId, ReadableMap dataMap,
     @ReactMethod
     public void destroy() {
 
+        CfClient.getInstance().unregisterEventsListener(listener);
         CfClient.getInstance().destroy();
-        listener = null;
     }
 
     private CfConfiguration configurationFromMap(ReadableMap configurationMap) {
 
         CfConfiguration.Builder builder = CfConfiguration.builder();
+
         if (configurationMap.hasKey("streamEnabled")) {
+
             boolean enableStream = configurationMap.getBoolean("streamEnabled");
             builder.enableStream(enableStream);
         }
-        if (configurationMap.hasKey("baseUrl")) {
-            String baseUrl = configurationMap.getString("baseUrl");
+
+        if (configurationMap.hasKey("analyticsEnabled")) {
+
+            boolean enableAnalytics = configurationMap.getBoolean("analyticsEnabled");
+            builder.enableAnalytics(enableAnalytics);
+        }
+
+        if (configurationMap.hasKey("baseURL")) {
+
+            String baseUrl = configurationMap.getString("baseURL");
             builder.baseUrl(baseUrl);
         }
-        if (configurationMap.hasKey("streamUrl")) {
-            String streamUrl = configurationMap.getString("streamUrl");
+
+        if (configurationMap.hasKey("streamURL")) {
+
+            String streamUrl = configurationMap.getString("streamURL");
             builder.streamUrl(streamUrl);
         }
+
+        if (configurationMap.hasKey("eventURL")) {
+
+            String eventUrl = configurationMap.getString("eventURL");
+            builder.eventUrl(eventUrl);
+        }
+
         if (configurationMap.hasKey("pollingInterval")) {
+
             int pollingInterval = configurationMap.getInt("pollingInterval");
             builder.pollingInterval(pollingInterval);
         }
@@ -224,14 +265,53 @@ private CfConfiguration configurationFromMap(ReadableMap configurationMap) {
     private Target targetFromMap(ReadableMap targetMap) {
 
         Target target = new Target();
+
         if (targetMap.hasKey("name")) {
+
             String name = targetMap.getString("name");
             target.name(name);
         }
+
         if (targetMap.hasKey("identifier")) {
+
             String identifier = targetMap.getString("identifier");
             target.identifier(identifier);
         }
+
         return target;
     }
+
+    private void sendEvent(final String type) throws IllegalStateException {
+
+        sendEvent(type, null);
+    }
+
+    private void sendEvent(
+
+            final String type,
+            final Object data
+
+    ) throws IllegalStateException {
+
+        System.out.println("sendEvent(): " + type + ", data: " + data);
+
+        final ReactApplicationContext context = getReactApplicationContext();
+        System.out.println("sendEvent(), context: " + context);
+
+        final DeviceEventManagerModule.RCTDeviceEventEmitter module =
+                context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class);
+
+        if (module == null) {
+
+            throw new IllegalStateException(
+
+                    "No event module available: " +
+                            DeviceEventManagerModule.RCTDeviceEventEmitter.class.getSimpleName()
+            );
+        } else {
+
+            System.out.println("sendEvent(), module (hash): " + module.hashCode());
+            module.emit(type, data);
+        }
+    }
 }
diff --git a/android/src/main/java/com/clientsdk/ClientNativePackage.java b/android/src/main/java/com/clientsdk/ClientNativePackage.java
index f4a81e6..d2b7242 100644
--- a/android/src/main/java/com/clientsdk/ClientNativePackage.java
+++ b/android/src/main/java/com/clientsdk/ClientNativePackage.java
@@ -11,21 +11,28 @@
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 
 public class ClientNativePackage implements ReactPackage {
+
+    @NonNull
     @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-        return Arrays.<NativeModule>asList(new ClientNativeModule(reactContext));
+    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
+
+        return Collections.singletonList(new ClientNativeModule(reactContext));
     }
 
     // Deprecated from RN 0.47
     public List<Class<? extends JavaScriptModule>> createJSModules() {
+
         return Collections.emptyList();
     }
 
+    @NonNull
     @Override
-    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+    public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
+
         return Collections.emptyList();
     }
 }
\ No newline at end of file
diff --git a/index.ts b/index.ts
index c376a2c..dae2af3 100644
--- a/index.ts
+++ b/index.ts
@@ -1,169 +1,204 @@
-import {NativeModules,NativeEventEmitter} from 'react-native';
-
- //Model class used for evaluation's data returned via events listeners.
- export class EvaluationResponse {
- 
-   constructor(flag, value){
-     this.flag = flag;
-     this.value = value
-   }
- 
-   flag: string
-   value: any
- }
- 
- //Model class for SDK client confiuration
- export class CfConfiguration {
-   configUrl?: string
-   eventUrl?: string
-   streamEnabled?: boolean
-   pollingInterval?: number
- }
- 
- //Model class to describe a target for features evaluations
- export class CfTarget {
-   identifier: string
-   name?: string
-   anonymous?: boolean
-   analyticsEnabled?: boolean
-   attributes?: any
- }
- 
- //Base class for SDK operations. 
- //It provides options to read current state of given evaluation or to subscribe for live SSE events, indicating a change in evaluation's state.
- //To use it, first initialize() method must be called, as described below, for a given API key and target instance.
- class CfClient {
-   eventEmitter = new NativeEventEmitter(NativeModules.ReactNativePlugin)
-   listeners = [];
- 
-   //Passes events from the Native side to the RN side
-   private sendEvent(eventType, data) {
-     this.listeners.forEach(element => element(eventType, data));
-   }
- 
-   static cfClientInstance = new CfClient();
- 
-   private constructor() {}
- 
-   private resolve(type, result) {
-     if (type == 'evaluation_polling') {
-       this.sendEvent(type, result.map((element) => new EvaluationResponse(element.flag, element.value)))
-     } else if (type == 'evaluation_change') {
-       this.sendEvent(type, new EvaluationResponse(result.flag, result.value))
-     } else if (type == 'start') {
-       this.sendEvent(type, null)
-     } else if (type == 'end') {
-       this.sendEvent(type, null)
-     }
-   }
- 
-   //Add Event Emitter Listeners, that match those on the native plugin side
-   private addEventEmitterListeners() {
-     this.eventEmitter.addListener("start", res => this.resolve("start", res));
-     this.eventEmitter.addListener("end", res => this.resolve("end", res));
-     this.eventEmitter.addListener("evaluation_polling", res => this.resolve("evaluation_polling", res));
-     this.eventEmitter.addListener("evaluation_change", res => this.resolve("evaluation_change", res));
-     console.log('EventEmitter Listeners added')
-     NativeModules.ReactNativePlugin.registerEventsListener()
-   }
- 
-   //Remove currently registered Event Emitter Listeners, if any
-   private removeEventEmitterListeners() {
-     this.eventEmitter.removeAllListeners("start")
-     this.eventEmitter.removeAllListeners("end")
-     this.eventEmitter.removeAllListeners("evaluation_polling")
-     this.eventEmitter.removeAllListeners("evaluation_change")
-     console.log('Current EventEmitter Listeners removed')
-   }
- 
-   //This method needs to be run first, to initiate authorization.
-   // - apiKey: `YOUR_API_KEY`
-   // - configuration: `CfConfiguration` to be used for Evaluation fetching
-   // - target: `CfTarget` describing target for Evaluation fetching
-   async initialize(apiKey: string, configuration: CfConfiguration, target: CfTarget) {
-     console.log('running init')
-     return await NativeModules.ReactNativePlugin.initialize(apiKey, configuration, target)
-   }
- 
-  //Registering for SSE events is done inside this function and it must be called to get SSE events. 
-  //Make sure to call initialize() prior calling this method. Possible event types are “start”, “end”, “evaluation_polling”, “evaluation_change”.
-  //Events will be forwarded to the listener, passed-in as an argument.
-   registerEventsListener(listener: (type: string, flags: any) => void) {
-     this.removeEventEmitterListeners()
-     this.addEventEmitterListeners()
- 
-     if (typeof listener !== "function" || this.listeners.some(element => element == listener)) {
-       return;
-     }
-     this.listeners.push(listener)
-   }
- 
-   //Unregister SSE events listener
-   unregisterListener(listener: (type: string, flags: any) => void) {
-     for (var i = 0; i < this.listeners.length; i++) {
- 
-       if (this.listeners[i] == listener) {
-         this.listeners.splice(i, 1);
-         i--;
-       }
-     }
-   }
- 
-   private unregisterAll() {
-     this.listeners = []
-   }
- 
-   //Fetch String variation for a specified key from cache, with default value if a given key does not exist.
-   //Make sure to call intialize() prior to calling this method.
-   //If called prior to calling intialize(), `defaultValue` will be returned or `null` if `defaultValue` was not specified.
-   stringVariation(evalutionId: string, defaultValue?:string) {
-     if (defaultValue == undefined) {
-       return NativeModules.ReactNativePlugin.stringVariation(evalutionId)
-     } else {
-       return NativeModules.ReactNativePlugin.stringVariationWithFallback(evalutionId, defaultValue)
-     }
-   }
- 
-   //Fetch Boolean variation for a specified key from cache, with default value, if a given key does not exist.
-   //Make sure to call intialize() prior to calling this method.
-   //If called prior to calling intialize(), `defaultValue` will be returned or `null`, if `defaultValue` was not specified.
-   boolVariation(evalutionId: string, defaultValue?: boolean) {
-     if (defaultValue == undefined) {
-       return NativeModules.ReactNativePlugin.boolVariation(evalutionId)
-     } else {
-       return NativeModules.ReactNativePlugin.boolVariationWithFallback(evalutionId, true)
-     }
-   }
- 
-   //Fetch Number variation for a specified key from cache, with default value, if a given key does not exist.
-   //Make sure to call intialize() prior to calling this method.
-   //If called prior to calling intialize(), `defaultValue` will be returned or `null`, if `defaultValue` was not specified.
-   numberVariation(evalutionId: string, defaultValue?:number) {
-     if (defaultValue == undefined) {
-       return NativeModules.ReactNativePlugin.numberVariation(evalutionId)
-     } else {
-       return NativeModules.ReactNativePlugin.numberVariationWithFallback(evalutionId, defaultValue)
-     }
-   }
- 
-   //Fetch JSON (Map) variation for a specified key from cache, with default value, if a given key does not exist.
-   //Make sure to call intialize() prior to calling this method.
-   //If called prior to calling intialize(), `defaultValue` will be returned or `null`, if `defaultValue` was not specified.
-   jsonVariation(evalutionId: string, defaultValue?: any) {
-     if (defaultValue == undefined) {
-       return NativeModules.ReactNativePlugin.jsonVariation(evalutionId)
-     } else {
-       return NativeModules.ReactNativePlugin.jsonVariationWithFallback(evalutionId, defaultValue)
-     }
-   }
- 
-   //Clears the occupied resources, removes any registered event listeners and shuts down the sdk.
-   //After calling this method, the SDK will remain inactive until intialize() is called again.
-   destroy() {
-     NativeModules.ReactNativePlugin.destroy()
-     this.unregisterAll()
-   }
- }
- 
- export default CfClient.cfClientInstance
- 
\ No newline at end of file
+import {NativeModules, NativeEventEmitter} from 'react-native';
+
+//Model class used for evaluation's data returned via events listeners.
+export class EvaluationResponse {
+
+    constructor(flag, value) {
+        this.flag = flag;
+        this.value = value
+    }
+
+    flag: string
+    value: any
+}
+
+//Model class for SDK client confiuration
+export class CfConfiguration {
+
+    baseURL?: string
+    eventURL?: string
+    streamURL?: string
+    analyticsEnabled?: boolean
+    streamEnabled?: boolean
+    pollingInterval?: number
+}
+
+//Model class to describe a target for features evaluations
+export class CfTarget {
+
+    identifier: string
+    name?: string
+    anonymous?: boolean
+    analyticsEnabled?: boolean
+    attributes?: any
+}
+
+//Base class for SDK operations.
+//It provides options to read current state of given evaluation or to subscribe for live SSE events, indicating a change in evaluation's state.
+//To use it, first initialize() method must be called, as described below, for a given API key and target instance.
+class CfClient {
+
+    eventEmitter = new NativeEventEmitter(NativeModules.ReactNativePlugin)
+    listeners = [];
+
+    // Passes events from the Native side to the RN side
+    private sendEvent(eventType, data) {
+
+        console.log('sendEvent(): ' + JSON.stringify(eventType) + ', ' + JSON.stringify(data))
+        this.listeners.forEach(element => element(eventType, data));
+    }
+
+    static cfClientInstance = new CfClient();
+
+    private constructor() {
+    }
+
+    private resolve(type, result) {
+
+        console.log('resolve(): ' + type + ', ' + JSON.stringify(result))
+
+        if (type == 'evaluation_polling') {
+
+            this.sendEvent(type, result.map((element) => new EvaluationResponse(element.flag, element.value)))
+        } else if (type == 'evaluation_change') {
+
+            this.sendEvent(type, new EvaluationResponse(result.flag, result.value))
+        } else if (type == 'start') {
+
+            this.sendEvent(type, null)
+        } else if (type == 'end') {
+
+            this.sendEvent(type, null)
+        }
+    }
+
+    // Add Event Emitter Listeners, that match those on the native plugin side
+    private addEventEmitterListeners() {
+
+        console.log('addEventEmitterListeners(): START')
+
+        this.eventEmitter.addListener("start", res => this.resolve("start", res));
+        this.eventEmitter.addListener("end", res => this.resolve("end", res));
+        this.eventEmitter.addListener("evaluation_polling", res => this.resolve("evaluation_polling", res));
+        this.eventEmitter.addListener("evaluation_change", res => this.resolve("evaluation_change", res));
+        // this.eventEmitter.addListener("start", (event) => console.log('===> 1'));
+        // this.eventEmitter.addListener("end", (event) => console.log('===> 2'));
+        // this.eventEmitter.addListener("evaluation_polling", (event) => console.log('===> 3'));
+        // this.eventEmitter.addListener("evaluation_change", (event) => console.log('===> 4'));
+
+        console.log('addEventEmitterListeners(): END')
+    }
+
+    //Remove currently registered Event Emitter Listeners, if any
+    private removeEventEmitterListeners() {
+
+        console.log('removeEventEmitterListeners(): START')
+
+        this.eventEmitter.removeAllListeners("start")
+        this.eventEmitter.removeAllListeners("end")
+        this.eventEmitter.removeAllListeners("evaluation_polling")
+        this.eventEmitter.removeAllListeners("evaluation_change")
+
+        console.log('removeEventEmitterListeners(): END')
+    }
+
+    //This method needs to be run first, to initiate authorization.
+    // - apiKey: `YOUR_API_KEY`
+    // - configuration: `CfConfiguration` to be used for Evaluation fetching
+    // - target: `CfTarget` describing target for Evaluation fetching
+    async initialize(apiKey: string, configuration: CfConfiguration, target: CfTarget) {
+
+        console.log('running init, configuration: ' + JSON.stringify(configuration))
+
+        return await NativeModules.ReactNativePlugin.initialize(apiKey, configuration, target)
+    }
+
+    // Registering for SSE events is done inside this function and it must be called to get SSE events.
+    // Make sure to call initialize() prior calling this method. Possible event types are “start”, “end”, “evaluation_polling”, “evaluation_change”.
+    // Events will be forwarded to the listener, passed-in as an argument.
+    registerListener(listener: (type: string, flags: any) => void) {
+
+        console.log('registerListener(): START')
+
+        this.removeEventEmitterListeners()
+        this.addEventEmitterListeners()
+
+        if (typeof listener !== "function" || this.listeners.some(element => element == listener)) {
+
+            console.log('registerListener(): RETURN')
+            return;
+        }
+        this.listeners.push(listener)
+
+        console.log('registerListener(): END')
+    }
+
+    //Unregister SSE events listener
+    unregisterListener(listener: (type: string, flags: any) => void) {
+        for (var i = 0; i < this.listeners.length; i++) {
+
+            if (this.listeners[i] == listener) {
+                this.listeners.splice(i, 1);
+                i--;
+            }
+        }
+    }
+
+    private unregisterAll() {
+
+        this.listeners = []
+    }
+
+    //Fetch String variation for a specified key from cache, with default value if a given key does not exist.
+    //Make sure to call intialize() prior to calling this method.
+    //If called prior to calling intialize(), `defaultValue` will be returned or `null` if `defaultValue` was not specified.
+    stringVariation(evalutionId: string, defaultValue?: string) {
+        if (defaultValue == undefined) {
+            return NativeModules.ReactNativePlugin.stringVariation(evalutionId)
+        } else {
+            return NativeModules.ReactNativePlugin.stringVariationWithFallback(evalutionId, defaultValue)
+        }
+    }
+
+    //Fetch Boolean variation for a specified key from cache, with default value, if a given key does not exist.
+    //Make sure to call intialize() prior to calling this method.
+    //If called prior to calling intialize(), `defaultValue` will be returned or `null`, if `defaultValue` was not specified.
+    boolVariation(evalutionId: string, defaultValue?: boolean) {
+        if (defaultValue == undefined) {
+            return NativeModules.ReactNativePlugin.boolVariation(evalutionId)
+        } else {
+            return NativeModules.ReactNativePlugin.boolVariationWithFallback(evalutionId, true)
+        }
+    }
+
+    //Fetch Number variation for a specified key from cache, with default value, if a given key does not exist.
+    //Make sure to call intialize() prior to calling this method.
+    //If called prior to calling intialize(), `defaultValue` will be returned or `null`, if `defaultValue` was not specified.
+    numberVariation(evalutionId: string, defaultValue?: number) {
+        if (defaultValue == undefined) {
+            return NativeModules.ReactNativePlugin.numberVariation(evalutionId)
+        } else {
+            return NativeModules.ReactNativePlugin.numberVariationWithFallback(evalutionId, defaultValue)
+        }
+    }
+
+    //Fetch JSON (Map) variation for a specified key from cache, with default value, if a given key does not exist.
+    //Make sure to call intialize() prior to calling this method.
+    //If called prior to calling intialize(), `defaultValue` will be returned or `null`, if `defaultValue` was not specified.
+    jsonVariation(evalutionId: string, defaultValue?: any) {
+        if (defaultValue == undefined) {
+            return NativeModules.ReactNativePlugin.jsonVariation(evalutionId)
+        } else {
+            return NativeModules.ReactNativePlugin.jsonVariationWithFallback(evalutionId, defaultValue)
+        }
+    }
+
+    //Clears the occupied resources, removes any registered event listeners and shuts down the sdk.
+    //After calling this method, the SDK will remain inactive until intialize() is called again.
+    destroy() {
+        NativeModules.ReactNativePlugin.destroy()
+        this.unregisterAll()
+    }
+}
+
+export default CfClient.cfClientInstance
diff --git a/ios/ReactNativePlugin.swift b/ios/ReactNativePlugin.swift
index 449b60a..f454e39 100644
--- a/ios/ReactNativePlugin.swift
+++ b/ios/ReactNativePlugin.swift
@@ -23,7 +23,7 @@ class ReactNativePlugin: RCTEventEmitter {
     print("Passed apiKey: \(apiKey)")
     let config = configFrom(dict: configuration)
     let target = targetFrom(dict: target)
-    
+
     CfClient.sharedInstance.initialize(apiKey: apiKey, configuration: config, target: target) {result in
       switch result {
         case .failure(let e):
@@ -33,7 +33,7 @@ class ReactNativePlugin: RCTEventEmitter {
       }
     }
   }
-  
+
   @objc func registerEventsListener(_ resolve:@escaping RCTPromiseResolveBlock, reject:@escaping RCTPromiseRejectBlock) {
     CfClient.sharedInstance.registerEventsListener { result in
       switch result {
@@ -66,7 +66,7 @@ class ReactNativePlugin: RCTEventEmitter {
       }
     }
   }
-  
+
   @objc func stringVariationWithFallback(_ evaluationId: String, defaultValue: String, resolve:@escaping RCTPromiseResolveBlock, reject:@escaping RCTPromiseRejectBlock) {
     CfClient.sharedInstance.stringVariation(evaluationId: evaluationId, defaultValue: defaultValue) { (evaluation) in
       let data = try? JSONEncoder().encode(evaluation)
@@ -143,7 +143,7 @@ class ReactNativePlugin: RCTEventEmitter {
     let key = defaultValue.keys.first!
     let value = defaultValue[key]
     let valueType: ValueType = determineType(value)
-    
+
     CfClient.sharedInstance.jsonVariation(evaluationId: evaluationId, defaultValue: [key:valueType]) { (evaluation) in
       let data = try? JSONEncoder().encode(evaluation)
       guard let validData = data else {
@@ -167,15 +167,15 @@ class ReactNativePlugin: RCTEventEmitter {
       resolve(json)
     }
   }
-  
+
   @objc func destroy() {
     CfClient.sharedInstance.destroy()
   }
-  
+
   override func supportedEvents() -> [String]! {
     return [EventTypeId.start.rawValue, EventTypeId.end.rawValue, EventTypeId.evaluationPolling.rawValue, EventTypeId.evaluationChange.rawValue]
   }
-  
+
   override class func requiresMainQueueSetup() -> Bool {
     return true
   }
@@ -202,25 +202,32 @@ extension ReactNativePlugin {
 extension ReactNativePlugin {
   //Extract CfConfiguration from dictionary
   func configFrom(dict: Dictionary<String, Any?>) -> CfConfiguration {
+
     let configBuilder = CfConfiguration.builder()
-    if let configUrl = dict["configUrl"] as? String {
+
+    if let configUrl = dict["baseURL"] as? String {
       _ = configBuilder.setConfigUrl(configUrl)
     }
+
     if let eventUrl = dict["eventUrl"] as? String {
       _ = configBuilder.setEventUrl(eventUrl)
     }
+
     if let streamEnabled = dict["streamEnabled"] as? Bool {
       _ = configBuilder.setStreamEnabled(streamEnabled)
     }
-    if let analitycsEnabled = dict["analyticsEnabled"] as? Bool {
-      _ = configBuilder.setAnalyticsEnabled(analitycsEnabled)
+
+    if let analyticsEnabled = dict["analyticsEnabled"] as? Bool {
+      _ = configBuilder.setAnalyticsEnabled(analyticsEnabled)
     }
+
     if let pollingInterval = dict["pollingInterval"] as? TimeInterval {
       _ = configBuilder.setPollingInterval(pollingInterval)
     }
+
     return configBuilder.build()
   }
-  
+
   //Extract CfTarget from dictionary
   func targetFrom(dict: Dictionary<String, Any?>) -> CfTarget {
     let targetBuilder = CfTarget.builder()
diff --git a/package.json b/package.json
index 4dd90bc..9e61227 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "babel-jest": "^26.6.3",
     "eslint": "^7.23.0",
     "jest": "^26.6.3",
-    "metro-react-native-babel-preset": "^0.65.2",
+    "metro-react-native-babel-preset": "^0.63",
     "react-test-renderer": "16.13.1"
   },
   "jest": {

From f93fe8596e2823f89ce5c406a81b83ab278ff307 Mon Sep 17 00:00:00 2001
From: Milos Vasic <milos.vasic@harness.io>
Date: Wed, 29 Sep 2021 17:00:38 +0300
Subject: [PATCH 2/9] FFM-1424 - Working on SSE support.

---
 android/src/main/java/com/clientsdk/ClientNativeModule.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/src/main/java/com/clientsdk/ClientNativeModule.java b/android/src/main/java/com/clientsdk/ClientNativeModule.java
index c35fb6a..7def356 100644
--- a/android/src/main/java/com/clientsdk/ClientNativeModule.java
+++ b/android/src/main/java/com/clientsdk/ClientNativeModule.java
@@ -310,7 +310,7 @@ private void sendEvent(
             );
         } else {
 
-            System.out.println("sendEvent(), module (hash): " + module.hashCode());
+            System.out.println("sendEvent(), module.emit");
             module.emit(type, data);
         }
     }

From c0ebb1cbec67fabb9601e972295071747ad96903 Mon Sep 17 00:00:00 2001
From: Milos Vasic <milos.vasic@harness.io>
Date: Wed, 29 Sep 2021 17:07:21 +0300
Subject: [PATCH 3/9] FFM-1424 - iOS configuration fields.

---
 ios/ReactNativePlugin.swift | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/ios/ReactNativePlugin.swift b/ios/ReactNativePlugin.swift
index f454e39..782217c 100644
--- a/ios/ReactNativePlugin.swift
+++ b/ios/ReactNativePlugin.swift
@@ -206,22 +206,32 @@ extension ReactNativePlugin {
     let configBuilder = CfConfiguration.builder()
 
     if let configUrl = dict["baseURL"] as? String {
+      
       _ = configBuilder.setConfigUrl(configUrl)
     }
 
-    if let eventUrl = dict["eventUrl"] as? String {
+    if let eventUrl = dict["eventURL"] as? String {
+      
       _ = configBuilder.setEventUrl(eventUrl)
     }
+    
+    if let streamUrl = dict["streamURL"] as? String {
+      
+      _ = configBuilder.setStreamUrl(streamUrl)
+    }
 
     if let streamEnabled = dict["streamEnabled"] as? Bool {
+      
       _ = configBuilder.setStreamEnabled(streamEnabled)
     }
 
     if let analyticsEnabled = dict["analyticsEnabled"] as? Bool {
+      
       _ = configBuilder.setAnalyticsEnabled(analyticsEnabled)
     }
 
     if let pollingInterval = dict["pollingInterval"] as? TimeInterval {
+      
       _ = configBuilder.setPollingInterval(pollingInterval)
     }
 

From fe1a59cb15ae07ad87ed755b53217a6e8e079a10 Mon Sep 17 00:00:00 2001
From: Andrija Milovanovic <ender357@gmail.com>
Date: Fri, 22 Oct 2021 11:57:11 +0200
Subject: [PATCH 4/9] Moving registerEventsListener to execute right after
 initialization

---
 ios/ReactNativePlugin.m     |  2 --
 ios/ReactNativePlugin.swift | 17 +++++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ios/ReactNativePlugin.m b/ios/ReactNativePlugin.m
index 9e4217b..8726369 100644
--- a/ios/ReactNativePlugin.m
+++ b/ios/ReactNativePlugin.m
@@ -18,8 +18,6 @@ @interface RCT_EXTERN_MODULE(ReactNativePlugin, RCTEventEmitter)
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(registerEventsListener:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
-
 RCT_EXTERN_METHOD(stringVariation:(NSString *)evaluationId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(stringVariationWithFallback:(NSString *)evaluationId defaultValue:(NSString *)defaultValue resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 
diff --git a/ios/ReactNativePlugin.swift b/ios/ReactNativePlugin.swift
index 782217c..f5867ac 100644
--- a/ios/ReactNativePlugin.swift
+++ b/ios/ReactNativePlugin.swift
@@ -24,25 +24,25 @@ class ReactNativePlugin: RCTEventEmitter {
     let config = configFrom(dict: configuration)
     let target = targetFrom(dict: target)
 
-    CfClient.sharedInstance.initialize(apiKey: apiKey, configuration: config, target: target) {result in
+    CfClient.sharedInstance.initialize(apiKey: apiKey, configuration: config, target: target) { [weak self] result in
       switch result {
         case .failure(let e):
           reject("\(e.errorData.statusCode ?? 200)","Could not initialize", e)
         case .success:
-          resolve(true)
+            self?.registerEventsListener(resolve, reject:reject)
       }
     }
   }
 
-  @objc func registerEventsListener(_ resolve:@escaping RCTPromiseResolveBlock, reject:@escaping RCTPromiseRejectBlock) {
-    CfClient.sharedInstance.registerEventsListener { result in
+  private func registerEventsListener(_ resolve:@escaping RCTPromiseResolveBlock, reject:@escaping RCTPromiseRejectBlock) {
+    CfClient.sharedInstance.registerEventsListener {[weak self] result in
       switch result {
         case .failure(let error):
           reject("\(error.errorData.statusCode ?? 200)", "Could not register to events listener", error)
         case .success(let eventType):
           switch eventType {
-            case .onOpen: self.sendEvent(withName: EventTypeId.start.rawValue, body: "SSE opened")
-            case .onComplete: self.sendEvent(withName: EventTypeId.end.rawValue, body: "SSE completed")
+            case .onOpen: self?.sendEvent(withName: EventTypeId.start.rawValue, body: "SSE opened")
+            case .onComplete: self?.sendEvent(withName: EventTypeId.end.rawValue, body: "SSE completed")
             case .onPolling(let evaluations):
               let data = try? JSONEncoder().encode(evaluations)
               guard let validData = data else {
@@ -51,7 +51,7 @@ class ReactNativePlugin: RCTEventEmitter {
                 return
               }
               let json = try? JSONSerialization.jsonObject(with: validData, options: .allowFragments) as? [[String:Any]]
-              self.sendEvent(withName: EventTypeId.evaluationPolling.rawValue, body: json)
+              self?.sendEvent(withName: EventTypeId.evaluationPolling.rawValue, body: json)
             case .onEventListener(let evaluation):
               let data = try? JSONEncoder().encode(evaluation)
               guard let validData = data else {
@@ -60,9 +60,10 @@ class ReactNativePlugin: RCTEventEmitter {
                 return
               }
               let json = try? JSONSerialization.jsonObject(with: validData, options: .allowFragments) as? [String:Any]
-              self.sendEvent(withName: EventTypeId.evaluationChange.rawValue, body: json)
+              self?.sendEvent(withName: EventTypeId.evaluationChange.rawValue, body: json)
             case.onMessage(_): print("Generic Message received")
           }
+          resolve(true)
       }
     }
   }

From 621acef798b2dc6966fa3aab99cc07d61dede6f7 Mon Sep 17 00:00:00 2001
From: Dusan Juranovic <dusan.juranovic@gmail.com>
Date: Mon, 25 Oct 2021 13:19:35 +0200
Subject: [PATCH 5/9] fix once callback

---
 index.ts                    |  5 +++++
 ios/ReactNativePlugin.swift | 25 +++++++++++++++----------
 package.json                |  8 ++++----
 tsconfig.json               |  3 +--
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/index.ts b/index.ts
index dae2af3..106c652 100644
--- a/index.ts
+++ b/index.ts
@@ -69,6 +69,9 @@ class CfClient {
         } else if (type == 'end') {
 
             this.sendEvent(type, null)
+        } else if (type == 'error') {
+
+            this.sendEvent(type, result)
         }
     }
 
@@ -81,6 +84,7 @@ class CfClient {
         this.eventEmitter.addListener("end", res => this.resolve("end", res));
         this.eventEmitter.addListener("evaluation_polling", res => this.resolve("evaluation_polling", res));
         this.eventEmitter.addListener("evaluation_change", res => this.resolve("evaluation_change", res));
+        this.eventEmitter.addListener("error", res => this.resolve("error", res));
         // this.eventEmitter.addListener("start", (event) => console.log('===> 1'));
         // this.eventEmitter.addListener("end", (event) => console.log('===> 2'));
         // this.eventEmitter.addListener("evaluation_polling", (event) => console.log('===> 3'));
@@ -98,6 +102,7 @@ class CfClient {
         this.eventEmitter.removeAllListeners("end")
         this.eventEmitter.removeAllListeners("evaluation_polling")
         this.eventEmitter.removeAllListeners("evaluation_change")
+        this.eventEmitter.removeAllListeners("error")
 
         console.log('removeEventEmitterListeners(): END')
     }
diff --git a/ios/ReactNativePlugin.swift b/ios/ReactNativePlugin.swift
index f5867ac..b45986b 100644
--- a/ios/ReactNativePlugin.swift
+++ b/ios/ReactNativePlugin.swift
@@ -14,9 +14,10 @@ class ReactNativePlugin: RCTEventEmitter {
 
   enum EventTypeId: String {
 		case start
-		case end
-		case evaluationPolling = "evaluation_polling"
-		case evaluationChange  = "evaluation_change"
+    case end
+    case evaluationPolling = "evaluation_polling"
+    case evaluationChange  = "evaluation_change"
+    case error
 	}
 
   @objc func initialize(_ apiKey: String, configuration: [String:Any], target: [String:Any], resolve:@escaping RCTPromiseResolveBlock, reject:@escaping RCTPromiseRejectBlock) {
@@ -29,16 +30,17 @@ class ReactNativePlugin: RCTEventEmitter {
         case .failure(let e):
           reject("\(e.errorData.statusCode ?? 200)","Could not initialize", e)
         case .success:
-            self?.registerEventsListener(resolve, reject:reject)
+          resolve(true)
+          self?.registerEventsListener()
       }
     }
   }
 
-  private func registerEventsListener(_ resolve:@escaping RCTPromiseResolveBlock, reject:@escaping RCTPromiseRejectBlock) {
+  private func registerEventsListener() {
     CfClient.sharedInstance.registerEventsListener {[weak self] result in
       switch result {
         case .failure(let error):
-          reject("\(error.errorData.statusCode ?? 200)", "Could not register to events listener", error)
+          self?.sendEvent(withName: EventTypeId.error.rawValue, body: "Could not register Events Listener")
         case .success(let eventType):
           switch eventType {
             case .onOpen: self?.sendEvent(withName: EventTypeId.start.rawValue, body: "SSE opened")
@@ -47,7 +49,7 @@ class ReactNativePlugin: RCTEventEmitter {
               let data = try? JSONEncoder().encode(evaluations)
               guard let validData = data else {
                 let error = CFError.noDataError
-                reject("\(error.errorData.statusCode ?? 200)", "No data available", error)
+                self?.sendEvent(withName: EventTypeId.error.rawValue, body: "No data available on evaluation_polling")
                 return
               }
               let json = try? JSONSerialization.jsonObject(with: validData, options: .allowFragments) as? [[String:Any]]
@@ -56,14 +58,13 @@ class ReactNativePlugin: RCTEventEmitter {
               let data = try? JSONEncoder().encode(evaluation)
               guard let validData = data else {
                 let error = CFError.noDataError
-                reject("\(error.errorData.statusCode ?? 200)", "No data available", error)
+                self?.sendEvent(withName: EventTypeId.error.rawValue, body: "No data available on evaluation_polling")
                 return
               }
               let json = try? JSONSerialization.jsonObject(with: validData, options: .allowFragments) as? [String:Any]
               self?.sendEvent(withName: EventTypeId.evaluationChange.rawValue, body: json)
             case.onMessage(_): print("Generic Message received")
           }
-          resolve(true)
       }
     }
   }
@@ -174,7 +175,11 @@ class ReactNativePlugin: RCTEventEmitter {
   }
 
   override func supportedEvents() -> [String]! {
-    return [EventTypeId.start.rawValue, EventTypeId.end.rawValue, EventTypeId.evaluationPolling.rawValue, EventTypeId.evaluationChange.rawValue]
+    return [EventTypeId.start.rawValue,
+            EventTypeId.end.rawValue,
+            EventTypeId.evaluationPolling.rawValue,
+            EventTypeId.evaluationChange.rawValue,
+            EventTypeId.error.rawValue]
   }
 
   override class func requiresMainQueueSetup() -> Bool {
diff --git a/package.json b/package.json
index 9e61227..ebbb803 100644
--- a/package.json
+++ b/package.json
@@ -14,12 +14,12 @@
   "author": "Harness Inc",
   "license": "Apache-2.0",
   "dependencies": {
-    "react": "16.13.1",
-    "react-native": "0.63.2"
+    "@types/react-native": "^0.65.9",
+    "react": "16.13.1"
   },
   "peerDependencies": {
-    "react-native": "~0.63",
-    "react": "~16.13.0"
+    "react": "~16.13.0",
+    "@types/react-native": "^0.65.9"
   },
   "devDependencies": {
     "@babel/core": "^7.13.13",
diff --git a/tsconfig.json b/tsconfig.json
index acdd57b..6aa3240 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,7 +7,6 @@
       ]
     },
     "files": [
-      "index.d.ts",
-      "test-types.ts"
+      "index.d.ts"
     ]
   }
\ No newline at end of file

From be9d550697f569c565ec3c62da3232399badfc28 Mon Sep 17 00:00:00 2001
From: Dusan Juranovic <dusan.juranovic@gmail.com>
Date: Wed, 27 Oct 2021 13:06:19 +0200
Subject: [PATCH 6/9] Updated package.json

---
 package.json | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index ebbb803..b61e8a6 100644
--- a/package.json
+++ b/package.json
@@ -14,13 +14,8 @@
   "author": "Harness Inc",
   "license": "Apache-2.0",
   "dependencies": {
-    "@types/react-native": "^0.65.9",
     "react": "16.13.1"
   },
-  "peerDependencies": {
-    "react": "~16.13.0",
-    "@types/react-native": "^0.65.9"
-  },
   "devDependencies": {
     "@babel/core": "^7.13.13",
     "@babel/runtime": "^7.13.10",
@@ -29,7 +24,8 @@
     "eslint": "^7.23.0",
     "jest": "^26.6.3",
     "metro-react-native-babel-preset": "^0.63",
-    "react-test-renderer": "16.13.1"
+    "react-test-renderer": "16.13.1",
+    "@types/react-native": "^0.65.9"
   },
   "jest": {
     "preset": "react-native"

From 3e0eac4bde20978488962fe944d3679a1b67ef7f Mon Sep 17 00:00:00 2001
From: Dusan Juranovic <dusan.juranovic@gmail.com>
Date: Wed, 27 Oct 2021 13:07:13 +0200
Subject: [PATCH 7/9] Revert error event and send empty body instead

---
 index.ts                    |  7 +------
 ios/ReactNativePlugin.swift | 17 ++++++++---------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/index.ts b/index.ts
index 106c652..b3c8689 100644
--- a/index.ts
+++ b/index.ts
@@ -69,10 +69,7 @@ class CfClient {
         } else if (type == 'end') {
 
             this.sendEvent(type, null)
-        } else if (type == 'error') {
-
-            this.sendEvent(type, result)
-        }
+        } 
     }
 
     // Add Event Emitter Listeners, that match those on the native plugin side
@@ -84,7 +81,6 @@ class CfClient {
         this.eventEmitter.addListener("end", res => this.resolve("end", res));
         this.eventEmitter.addListener("evaluation_polling", res => this.resolve("evaluation_polling", res));
         this.eventEmitter.addListener("evaluation_change", res => this.resolve("evaluation_change", res));
-        this.eventEmitter.addListener("error", res => this.resolve("error", res));
         // this.eventEmitter.addListener("start", (event) => console.log('===> 1'));
         // this.eventEmitter.addListener("end", (event) => console.log('===> 2'));
         // this.eventEmitter.addListener("evaluation_polling", (event) => console.log('===> 3'));
@@ -102,7 +98,6 @@ class CfClient {
         this.eventEmitter.removeAllListeners("end")
         this.eventEmitter.removeAllListeners("evaluation_polling")
         this.eventEmitter.removeAllListeners("evaluation_change")
-        this.eventEmitter.removeAllListeners("error")
 
         console.log('removeEventEmitterListeners(): END')
     }
diff --git a/ios/ReactNativePlugin.swift b/ios/ReactNativePlugin.swift
index b45986b..ee8cd06 100644
--- a/ios/ReactNativePlugin.swift
+++ b/ios/ReactNativePlugin.swift
@@ -17,7 +17,6 @@ class ReactNativePlugin: RCTEventEmitter {
     case end
     case evaluationPolling = "evaluation_polling"
     case evaluationChange  = "evaluation_change"
-    case error
 	}
 
   @objc func initialize(_ apiKey: String, configuration: [String:Any], target: [String:Any], resolve:@escaping RCTPromiseResolveBlock, reject:@escaping RCTPromiseRejectBlock) {
@@ -39,8 +38,9 @@ class ReactNativePlugin: RCTEventEmitter {
   private func registerEventsListener() {
     CfClient.sharedInstance.registerEventsListener {[weak self] result in
       switch result {
-        case .failure(let error):
-          self?.sendEvent(withName: EventTypeId.error.rawValue, body: "Could not register Events Listener")
+        case .failure(let _):
+          //In case registering Events Listener fails, return EventTypeId.start event with explanatory String body.
+          self?.sendEvent(withName: EventTypeId.start.rawValue, body: "Registering EventsListener failed")
         case .success(let eventType):
           switch eventType {
             case .onOpen: self?.sendEvent(withName: EventTypeId.start.rawValue, body: "SSE opened")
@@ -48,8 +48,8 @@ class ReactNativePlugin: RCTEventEmitter {
             case .onPolling(let evaluations):
               let data = try? JSONEncoder().encode(evaluations)
               guard let validData = data else {
-                let error = CFError.noDataError
-                self?.sendEvent(withName: EventTypeId.error.rawValue, body: "No data available on evaluation_polling")
+                //In case decoding `evaluations` data fails, return and empty array.
+                 self?.sendEvent(withName: EventTypeId.evaluationPolling.rawValue, body: [])
                 return
               }
               let json = try? JSONSerialization.jsonObject(with: validData, options: .allowFragments) as? [[String:Any]]
@@ -57,8 +57,8 @@ class ReactNativePlugin: RCTEventEmitter {
             case .onEventListener(let evaluation):
               let data = try? JSONEncoder().encode(evaluation)
               guard let validData = data else {
-                let error = CFError.noDataError
-                self?.sendEvent(withName: EventTypeId.error.rawValue, body: "No data available on evaluation_polling")
+                //In case decoding `evaluation` data fails, return an empty dictionary.
+                 self?.sendEvent(withName: EventTypeId.evaluationChange.rawValue, body: [:])
                 return
               }
               let json = try? JSONSerialization.jsonObject(with: validData, options: .allowFragments) as? [String:Any]
@@ -178,8 +178,7 @@ class ReactNativePlugin: RCTEventEmitter {
     return [EventTypeId.start.rawValue,
             EventTypeId.end.rawValue,
             EventTypeId.evaluationPolling.rawValue,
-            EventTypeId.evaluationChange.rawValue,
-            EventTypeId.error.rawValue]
+            EventTypeId.evaluationChange.rawValue]
   }
 
   override class func requiresMainQueueSetup() -> Bool {

From 6025ebf60fba3daf2b0ead562517d3a64b916bf3 Mon Sep 17 00:00:00 2001
From: Dusan Juranovic <dusan.juranovic@gmail.com>
Date: Wed, 27 Oct 2021 13:14:32 +0200
Subject: [PATCH 8/9] comment correction

---
 ios/ReactNativePlugin.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ios/ReactNativePlugin.swift b/ios/ReactNativePlugin.swift
index ee8cd06..a4a16b4 100644
--- a/ios/ReactNativePlugin.swift
+++ b/ios/ReactNativePlugin.swift
@@ -48,7 +48,7 @@ class ReactNativePlugin: RCTEventEmitter {
             case .onPolling(let evaluations):
               let data = try? JSONEncoder().encode(evaluations)
               guard let validData = data else {
-                //In case decoding `evaluations` data fails, return and empty array.
+                //In case encoding `evaluations` data fails, return and empty array.
                  self?.sendEvent(withName: EventTypeId.evaluationPolling.rawValue, body: [])
                 return
               }
@@ -57,7 +57,7 @@ class ReactNativePlugin: RCTEventEmitter {
             case .onEventListener(let evaluation):
               let data = try? JSONEncoder().encode(evaluation)
               guard let validData = data else {
-                //In case decoding `evaluation` data fails, return an empty dictionary.
+                //In case encoding `evaluation` data fails, return an empty dictionary.
                  self?.sendEvent(withName: EventTypeId.evaluationChange.rawValue, body: [:])
                 return
               }

From f5174da7e971c38aeea8998644b36f1c584284f7 Mon Sep 17 00:00:00 2001
From: Andrija Milovanovic <ender357@gmail.com>
Date: Wed, 27 Oct 2021 16:23:32 +0200
Subject: [PATCH 9/9] Revert package.json changes

---
 package.json | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index b61e8a6..9e61227 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,12 @@
   "author": "Harness Inc",
   "license": "Apache-2.0",
   "dependencies": {
-    "react": "16.13.1"
+    "react": "16.13.1",
+    "react-native": "0.63.2"
+  },
+  "peerDependencies": {
+    "react-native": "~0.63",
+    "react": "~16.13.0"
   },
   "devDependencies": {
     "@babel/core": "^7.13.13",
@@ -24,8 +29,7 @@
     "eslint": "^7.23.0",
     "jest": "^26.6.3",
     "metro-react-native-babel-preset": "^0.63",
-    "react-test-renderer": "16.13.1",
-    "@types/react-native": "^0.65.9"
+    "react-test-renderer": "16.13.1"
   },
   "jest": {
     "preset": "react-native"