@luciq/react-native 19.4.0-44237-SNAPSHOT → 19.4.0-47504-SNAPSHOT

package/README.md

@@ -231,121 +231,3 @@ await APM.addCompletedCustomSpan('Background Task', start, end);
 ## Documentation
 
 For more details about the supported APIs and how to use them, check our [**Documentation**](https://docs.luciq.ai/docs/react-native-overview).
-
-## Contributing: Adding a Native Method
-
-The library is a dual-architecture TurboModule — one spec drives codegen for both the legacy bridge and the new architecture. When you add a new native method, you'll touch the files listed below. The exact Android step depends on which pattern the target module uses.
-
-### 1. Spec (one file, source of truth)
-
-Declare the method in the corresponding spec file under `src/native/specs/`:
-
-| Module               | Spec file                  |
-| -------------------- | -------------------------- |
-| Core                 | `NativeLuciq.ts`           |
-| `LCQBugReporting`    | `NativeBugReporting.ts`    |
-| `LCQCrashReporting`  | `NativeCrashReporting.ts`  |
-| `LCQAPM`             | `NativeAPM.ts`             |
-| `LCQSurveys`         | `NativeSurveys.ts`         |
-| `LCQReplies`         | `NativeReplies.ts`         |
-| `LCQFeatureRequests` | `NativeFeatureRequests.ts` |
-| `LCQSessionReplay`   | `NativeSessionReplay.ts`   |
-| `LCQNetworkLogger`   | `NativeNetworkLogger.ts`   |
-
-Example — adding `setFoo(value: string): Promise<boolean>` to Crash Reporting:
-
-```ts
-// src/native/specs/NativeCrashReporting.ts
-export interface Spec extends TurboModule {
-  // …existing methods…
-  setFoo(value: string): Promise<boolean>;
-}
-```
-
-Spec type constraints to keep in mind:
-
-- Parameter types must be: `boolean`, `number`, `string`, `Object`, `UnsafeObject`, `Array<T>`, or explicit `T | null`. No TS enums, no unions of non-null types, no optional `?` parameters, no `Record<K,V>`.
-- Enums → `string`. The rich enum type stays in the public wrapper (`src/modules/*.ts`), which converts to the string value before the native call.
-- Nullable args → explicit `| null`, not `?`.
-- Arbitrary object payloads → `UnsafeObject` (from `react-native/Libraries/Types/CodegenTypes`).
-- Callback function args aren't supported. Use a no-arg method plus a `NativeEventEmitter` subscription on the JS side.
-
-### 2. JS wrapper types
-
-Add the method to the legacy interface so public code type-checks:
-
-```ts
-// src/native/NativeCrashReporting.ts
-export interface CrashReportingNativeModule extends NativeModule {
-  // …existing methods…
-  setFoo(value: string): Promise<boolean>;
-}
-```
-
-If the method is part of the developer-facing API, also expose it from `src/modules/*.ts` with rich types (enums, overloads, etc.). That wrapper is responsible for converting rich types to the spec-compatible primitives.
-
-### 3. iOS (one file — `.mm`)
-
-Add an `RCT_EXPORT_METHOD` block to the corresponding bridge under `ios/RNLuciq/`:
-
-```objc
-// ios/RNLuciq/LuciqCrashReportingBridge.mm
-RCT_EXPORT_METHOD(setFoo:(NSString *)value
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject) {
-  // implementation
-  resolve(@YES);
-}
-```
-
-The same `RCT_EXPORT_METHOD` serves both old and new architecture. Match the selector labels (`resolve:`, `reject:`) to the codegen-generated protocol — don't use `resolver:` / `rejecter:`. The `#ifdef RCT_NEW_ARCH_ENABLED` block at the bottom of each bridge (`getTurboModule:`) is already in place; you don't need to touch it.
-
-### 4. Android
-
-All 9 modules use the **shim pattern**. Add the method directly to the real module file in `android/src/main/java/ai/luciq/reactlibrary/RNLuciqXModule.java` with an `@ReactMethod` annotation whose signature matches the spec exactly:
-
-```java
-@ReactMethod
-public void setFoo(String value, Promise promise) {
-    MainThreadHandler.runOnMainThread(() -> {
-        // implementation
-        promise.resolve(true);
-    });
-}
-```
-
-How it works under the hood: each module extends a thin `RNLuciqXBaseSpec` abstract class that exists in two flavors:
-
-- `android/src/oldarch/java/.../RNLuciqXBaseSpec.java` — extends `EventEmitterModule` or `ReactContextBaseJavaModule`
-- `android/src/newarch/java/.../RNLuciqXBaseSpec.java` — extends the codegen-generated `NativeXSpec`
-
-Gradle activates one or the other based on `newArchEnabled`. You don't edit these shim files when adding a method — only the main module file. On old arch `@ReactMethod` handles dispatch; on new arch your method's signature overrides the abstract method on `NativeXSpec`.
-
-If the new-arch abstract signature uses `double` (codegen maps TS `number` → `double`) or `@Nullable Double` (for `number | null`), make sure your method matches exactly — the compiler will tell you if it doesn't.
-
-### 5. Verify
-
-Run the full check:
-
-```bash
-# Type-check and unit tests
-yarn build:lib && yarn test
-
-# Android — old arch
-cd examples/default/android && ./gradlew :app:compileDebugJavaWithJavac
-
-# Android — new arch
-./gradlew :app:compileDebugJavaWithJavac -PnewArchEnabled=true
-
-# iOS — old arch
-cd examples/default/ios && pod install && xcodebuild -workspace LuciqExample.xcworkspace -scheme LuciqExample -configuration Debug -destination 'generic/platform=iOS Simulator' -sdk iphonesimulator build
-
-# iOS — new arch
-RCT_NEW_ARCH_ENABLED=1 pod install && RCT_NEW_ARCH_ENABLED=1 xcodebuild -workspace LuciqExample.xcworkspace -scheme LuciqExample -configuration Debug -destination 'generic/platform=iOS Simulator' -sdk iphonesimulator build
-```
-
-All four builds must pass before merging.
-
-### Platform-only methods
-
-If a method only applies to one platform (e.g. `setNotificationIcon` for Android, `setShakingThresholdForiPad` for iOS), still declare it in the spec — then stub it as a no-op on the other platform so the unified abstract class stays satisfied.

package/RNLuciq.podspec

@@ -15,11 +15,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "15.0"
   s.source_files = "ios/**/*.{h,m,mm}"
 
-  if respond_to?(:install_modules_dependencies, true)
-    install_modules_dependencies(s)
-  else
-    s.dependency 'React-Core'
-  end
-
+  s.dependency 'React-Core'
   use_luciq!(s)
+
 end

package/android/build.gradle

@@ -1,19 +1,4 @@
-boolean isNewArchitectureEnabled() {
-    // Checks `newArchEnabled=true` in any of:
-    //   * consuming app's `android/gradle.properties` (via rootProject)
-    //   * this library's `gradle.properties` (via project)
-    //   * `-PnewArchEnabled=true` on the command line
-    def fromRoot = rootProject.hasProperty("newArchEnabled") &&
-                   rootProject.getProperty("newArchEnabled") == "true"
-    def fromProject = project.hasProperty("newArchEnabled") &&
-                      project.getProperty("newArchEnabled") == "true"
-    return fromRoot || fromProject
-}
-
 apply plugin: 'com.android.library'
-if (isNewArchitectureEnabled()) {
-    apply plugin: 'com.facebook.react'
-}
 
 apply from: './jacoco.gradle'
 apply from: './native.gradle'
@@ -84,16 +69,6 @@ android {
         abortOnError true
         // SuppressLint WrongConstant was used to suppress errors when using arrays of ints to represent annotations.
     }
-
-    sourceSets {
-        main {
-            if (isNewArchitectureEnabled()) {
-                java.srcDirs += ['src/newarch/java']
-            } else {
-                java.srcDirs += ['src/oldarch/java']
-            }
-        }
-    }
 }
 
 dependencies {

package/android/proguard-rules.txt

@@ -1 +1 @@
--keep class com.luciq.** {*;}
+-keep class ai.luciq.** {*;}

package/android/src/main/java/ai/luciq/reactlibrary/RNLuciqAPMModule.java

@@ -28,7 +28,9 @@ import ai.luciq.apm.networkinterception.cp.APMCPNetworkLog;
 import ai.luciq.reactlibrary.utils.EventEmitterModule;
 import ai.luciq.reactlibrary.utils.MainThreadHandler;
 
-public class RNLuciqAPMModule extends RNLuciqAPMBaseSpec {
+public class RNLuciqAPMModule extends EventEmitterModule {
+
+    private static final String NET_TAG = "LCQ-RN-NET";
 
     public RNLuciqAPMModule(ReactApplicationContext reactApplicationContext) {
         super(reactApplicationContext);
@@ -45,7 +47,7 @@ public class RNLuciqAPMModule extends RNLuciqAPMBaseSpec {
      * Pauses the current thread for 3 seconds.
      */
     @ReactMethod
-    public void lcqSleep() {
+    public void LCQSleep() {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
@@ -310,7 +312,7 @@ public class RNLuciqAPMModule extends RNLuciqAPMBaseSpec {
      *                            debugging and troubleshooting network-related issues.
      */
     @ReactMethod
-    public void networkLogAndroid(final double requestStartTime,
+    private void networkLogAndroid(final double requestStartTime,
                                    final double requestDuration,
                                    final String requestHeaders,
                                    final String requestBody,
@@ -328,6 +330,7 @@ public class RNLuciqAPMModule extends RNLuciqAPMBaseSpec {
                                    @Nullable final String gqLCQueryName,
                                    @Nullable final String serverErrorMessage
     ) {
+        Log.d(NET_TAG, "[networkLogAndroid-APM] Received from JS: " + requestMethod + " " + requestUrl + ", status=" + (int) statusCode + ", duration=" + (long) requestDuration + "ms, startTime=" + (long) requestStartTime + ", error=" + errorDomain + ", gqlQuery=" + gqLCQueryName);
         try {
             APMNetworkLogger networkLogger = new APMNetworkLogger();
 
@@ -349,8 +352,10 @@ public class RNLuciqAPMModule extends RNLuciqAPMBaseSpec {
                 }
 
             } catch (Exception e) {
+                Log.e(NET_TAG, "[networkLogAndroid-APM] Error parsing W3C attributes for " + requestMethod + " " + requestUrl, e);
                 e.printStackTrace();
             }
+            Log.d(NET_TAG, "[networkLogAndroid-APM] W3C attrs — isW3cHeaderFound=" + isW3cHeaderFound + ", partialId=" + partialId + ", networkStartTimeInSeconds=" + networkStartTimeInSeconds + ", generatedHeader=" + (w3cAttributes != null && !w3cAttributes.isNull("w3cGeneratedHeader") ? w3cAttributes.getString("w3cGeneratedHeader") : "null") + ", caughtHeader=" + (w3cAttributes != null && !w3cAttributes.isNull("w3cCaughtHeader") ? w3cAttributes.getString("w3cCaughtHeader") : "null"));
             APMCPNetworkLog.W3CExternalTraceAttributes w3cExternalTraceAttributes =
                     new APMCPNetworkLog.W3CExternalTraceAttributes(
                             isW3cHeaderFound,
@@ -382,13 +387,17 @@ public class RNLuciqAPMModule extends RNLuciqAPMBaseSpec {
                             serverErrorMessage,
                             w3cExternalTraceAttributes
                     );
+                    Log.d(NET_TAG, "[networkLogAndroid-APM] Successfully invoked APMNetworkLogger.log via reflection: " + requestMethod + " " + requestUrl);
                 } else {
+                    Log.e(NET_TAG, "[networkLogAndroid-APM] APMNetworkLogger.log method NOT found by reflection — network log will be lost: " + requestMethod + " " + requestUrl);
                     Log.e("IB-CP-Bridge", "APMNetworkLogger.log was not found by reflection");
                 }
             } catch (Throwable e) {
+                Log.e(NET_TAG, "[networkLogAndroid-APM] Exception invoking APMNetworkLogger.log: " + e.getMessage() + " for " + requestMethod + " " + requestUrl, e);
                 e.printStackTrace();
             }
         } catch (Throwable e) {
+            Log.e(NET_TAG, "[networkLogAndroid-APM] Top-level exception: " + e.getMessage() + " for " + requestMethod + " " + requestUrl, e);
             e.printStackTrace();
         }
     }

package/android/src/main/java/ai/luciq/reactlibrary/RNLuciqBugReportingModule.java

@@ -5,6 +5,7 @@ import android.annotation.TargetApi;
 import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
@@ -19,6 +20,7 @@ import ai.luciq.library.invocation.OnInvokeCallback;
 import ai.luciq.library.invocation.util.LuciqFloatingButtonEdge;
 import ai.luciq.library.invocation.util.LuciqVideoRecordingButtonPosition;
 import ai.luciq.reactlibrary.utils.ArrayUtil;
+import ai.luciq.reactlibrary.utils.EventEmitterModule;
 import ai.luciq.reactlibrary.utils.MainThreadHandler;
 import ai.luciq.bug.userConsent.ActionType;
 import java.util.ArrayList;
@@ -27,7 +29,7 @@ import ai.luciq.bug.ProactiveReportingConfigs;
 
 import javax.annotation.Nonnull;
 
-public class RNLuciqBugReportingModule extends RNLuciqBugReportingBaseSpec {
+public class RNLuciqBugReportingModule extends EventEmitterModule {
     public RNLuciqBugReportingModule(ReactApplicationContext reactContext) {
         super(reactContext);
     }
@@ -38,6 +40,16 @@ public class RNLuciqBugReportingModule extends RNLuciqBugReportingBaseSpec {
         return "LCQBugReporting";
     }
 
+    @ReactMethod
+    public void addListener(String event) {
+        super.addListener(event);
+    }
+
+    @ReactMethod
+    public void removeListeners(Integer count) {
+        super.removeListeners(count);
+    }
+
     /**
      * Enable or disable all BugReporting related features.
      * @param isEnabled boolean indicating enabled or disabled.
@@ -229,7 +241,7 @@ public class RNLuciqBugReportingModule extends RNLuciqBugReportingBaseSpec {
      *                             invoking the SDK
      */
     @ReactMethod
-    public void setOnInvokeHandler() {
+    public void setOnInvokeHandler(final Callback onInvokeHandler) {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
@@ -253,13 +265,13 @@ public class RNLuciqBugReportingModule extends RNLuciqBugReportingBaseSpec {
      * @param floatingButtonOffset integer offset from the left or right edge of the screen.
      */
     @ReactMethod
-    public void setFloatingButtonEdge(final String floatingButtonEdge, final double floatingButtonOffset) {
+    public void setFloatingButtonEdge(final String floatingButtonEdge, final int floatingButtonOffset) {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
                 final LuciqFloatingButtonEdge parsedEdge = ArgsRegistry.floatingButtonEdges
                         .getOrDefault(floatingButtonEdge, LuciqFloatingButtonEdge.RIGHT);
-                BugReporting.setFloatingButtonOffset((int) floatingButtonOffset);
+                BugReporting.setFloatingButtonOffset(floatingButtonOffset);
                 BugReporting.setFloatingButtonEdge(parsedEdge);
             }
         });
@@ -274,7 +286,7 @@ public class RNLuciqBugReportingModule extends RNLuciqBugReportingBaseSpec {
      *                              dismissing the SDK.
      */
     @ReactMethod
-    public void setOnSDKDismissedHandler() {
+    public void setOnSDKDismissedHandler(final Callback handler) {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
@@ -304,12 +316,12 @@ public class RNLuciqBugReportingModule extends RNLuciqBugReportingBaseSpec {
      * @param androidThreshold Threshold for android devices.
      */
     @ReactMethod
-    public void setShakingThresholdForAndroid(final double androidThreshold) {
+    public void setShakingThresholdForAndroid(final int androidThreshold) {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
                 try {
-                    BugReporting.setShakingThreshold((int) androidThreshold);
+                    BugReporting.setShakingThreshold(androidThreshold);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -384,7 +396,7 @@ public class RNLuciqBugReportingModule extends RNLuciqBugReportingBaseSpec {
     * @param reportTypes (Optional) Array of reportType. If it's not passed, the limit will apply to all report types.
     */
     @ReactMethod
-    public void setCommentMinimumCharacterCount(final double limit, final ReadableArray reportTypes){
+    public void setCommentMinimumCharacterCount(final int limit, final ReadableArray reportTypes){
         MainThreadHandler.runOnMainThread(new Runnable() {
             @SuppressLint("WrongConstant")
             @Override
@@ -398,7 +410,7 @@ public class RNLuciqBugReportingModule extends RNLuciqBugReportingBaseSpec {
                         typesInts[i] = types.get(i);
                     }
 
-                    BugReporting.setCommentMinimumCharacterCountForBugReportType((int) limit, typesInts);                } catch (Exception e) {
+                    BugReporting.setCommentMinimumCharacterCountForBugReportType(limit, typesInts);                } catch (Exception e) {
                     e.printStackTrace();
                 }
             }
@@ -436,13 +448,13 @@ public class RNLuciqBugReportingModule extends RNLuciqBugReportingBaseSpec {
      * @param gapBetweenModals         controls the time gap between showing 2 proactive reporting dialogs in seconds
      */
     @ReactMethod
-    public void setProactiveReportingConfigurations(final boolean enabled, final double gapBetweenModals, final double modalDelayAfterDetection) {
+    public void setProactiveReportingConfigurations(final boolean enabled, final int gapBetweenModals, final int modalDelayAfterDetection) {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
                 ProactiveReportingConfigs configs = new ProactiveReportingConfigs.Builder()
-                        .setGapBetweenModals((int) gapBetweenModals) // Time in seconds
-                        .setModalDelayAfterDetection((int) modalDelayAfterDetection) // Time in seconds
+                        .setGapBetweenModals(gapBetweenModals) // Time in seconds
+                        .setModalDelayAfterDetection(modalDelayAfterDetection) // Time in seconds
                         .isEnabled(enabled) //Enable/disable
                         .build();
                 BugReporting.setProactiveReportingConfigurations(configs);
@@ -451,20 +463,4 @@ public class RNLuciqBugReportingModule extends RNLuciqBugReportingBaseSpec {
             }
         });
     }
-
-    @ReactMethod
-    public void setAutoScreenRecordingDuration(double maxDuration) {
-    }
-
-    @ReactMethod
-    public void setShakingThresholdForiPhone(double threshold) {
-    }
-
-    @ReactMethod
-    public void setShakingThresholdForiPad(double threshold) {
-    }
-
-    @ReactMethod
-    public void setDidSelectPromptOptionHandler() {
-    }
 }

package/android/src/main/java/ai/luciq/reactlibrary/RNLuciqCrashReportingModule.java

@@ -6,6 +6,7 @@ import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import ai.luciq.crash.CrashReporting;
@@ -23,7 +24,7 @@ import java.util.Map;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public class RNLuciqCrashReportingModule extends RNLuciqCrashReportingBaseSpec {
+public class RNLuciqCrashReportingModule extends ReactContextBaseJavaModule {
 
     public RNLuciqCrashReportingModule(ReactApplicationContext reactApplicationContext) {
         super(reactApplicationContext);
@@ -66,9 +67,9 @@ public class RNLuciqCrashReportingModule extends RNLuciqCrashReportingBaseSpec {
      *                        finishes processing/handling the crash.
      */
     @ReactMethod
-    public void sendJSCrash(final ReadableMap exceptionObject, final Promise promise) {
+    public void sendJSCrash(final String exceptionObject, final Promise promise) {
         try {
-            JSONObject jsonObject = exceptionObject == null ? new JSONObject() : new JSONObject(exceptionObject.toHashMap());
+            JSONObject jsonObject = new JSONObject(exceptionObject);
             sendJSCrashByReflection(jsonObject, false, new Runnable() {
                 @Override
                 public void run() {
@@ -89,9 +90,9 @@ public class RNLuciqCrashReportingModule extends RNLuciqCrashReportingBaseSpec {
      * @param level       different severity levels for errors
      */
     @ReactMethod
-    public void sendHandledJSCrash(final ReadableMap exceptionObject, @Nullable final ReadableMap userAttributes, @Nullable final String fingerprint, @Nullable final String level, final Promise promise) {
+    public void sendHandledJSCrash(final String exceptionObject, @Nullable final ReadableMap userAttributes, @Nullable final String fingerprint, @Nullable final String level) {
         try {
-            final JSONObject jsonObject = exceptionObject == null ? new JSONObject() : new JSONObject(exceptionObject.toHashMap());
+            final JSONObject jsonObject = new JSONObject(exceptionObject);
             MainThreadHandler.runOnMainThread(new Runnable() {
                 @Override
                 public void run() {
@@ -107,17 +108,14 @@ public class RNLuciqCrashReportingModule extends RNLuciqCrashReportingBaseSpec {
 
                             RNLuciqReactnativeModule.clearCurrentReport();
                         }
-                        promise.resolve(null);
                     } catch (ClassNotFoundException | IllegalAccessException |
                              InvocationTargetException e) {
                         e.printStackTrace();
-                        promise.resolve(null);
                     }
                 }
             });
         } catch (Throwable e) {
             e.printStackTrace();
-            promise.resolve(null);
         }
     }
 
@@ -152,7 +150,7 @@ public class RNLuciqCrashReportingModule extends RNLuciqCrashReportingBaseSpec {
      * @param isEnabled boolean indicating enabled or disabled.
      */
     @ReactMethod
-    public void setNDKCrashesEnabled(final boolean isEnabled, final Promise promise) {
+    public void setNDKCrashesEnabled(final boolean isEnabled) {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
@@ -165,16 +163,7 @@ public class RNLuciqCrashReportingModule extends RNLuciqCrashReportingBaseSpec {
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-                promise.resolve(null);
             }
         });
     }
-
-    @ReactMethod
-    public void addListener(String eventName) {
-    }
-
-    @ReactMethod
-    public void removeListeners(double count) {
-    }
 }

package/android/src/main/java/ai/luciq/reactlibrary/RNLuciqFeatureRequestsModule.java

@@ -3,6 +3,7 @@ package ai.luciq.reactlibrary;
 import android.annotation.SuppressLint;
 
 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 ai.luciq.featuresrequest.FeatureRequests;
@@ -14,7 +15,7 @@ import java.util.ArrayList;
 
 import javax.annotation.Nonnull;
 
-public class RNLuciqFeatureRequestsModule extends RNLuciqFeatureRequestsBaseSpec {
+public class RNLuciqFeatureRequestsModule extends ReactContextBaseJavaModule {
 
     public RNLuciqFeatureRequestsModule(ReactApplicationContext reactApplicationContext) {
         super(reactApplicationContext);

package/android/src/main/java/ai/luciq/reactlibrary/RNLuciqNetworkLoggerModule.java

@@ -19,6 +19,7 @@ import com.facebook.react.bridge.WritableNativeMap;
 import ai.luciq.apm.InternalAPM;
 import ai.luciq.apm.sanitization.OnCompleteCallback;
 import ai.luciq.library.logging.listeners.networklogs.NetworkLogSnapshot;
+import ai.luciq.reactlibrary.utils.EventEmitterModule;
 import ai.luciq.reactlibrary.utils.MainThreadHandler;
 
 import org.json.JSONException;
@@ -29,7 +30,9 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 
-public class RNLuciqNetworkLoggerModule extends RNLuciqNetworkLoggerBaseSpec {
+public class RNLuciqNetworkLoggerModule extends EventEmitterModule {
+
+    private static final String NET_TAG = "LCQ-RN-NET";
 
     public final ConcurrentHashMap<String, OnCompleteCallback<NetworkLogSnapshot>> callbackMap = new ConcurrentHashMap<String, OnCompleteCallback<NetworkLogSnapshot>>();
 
@@ -45,8 +48,20 @@ public class RNLuciqNetworkLoggerModule extends RNLuciqNetworkLoggerBaseSpec {
     }
 
 
+    @ReactMethod
+    public void addListener(String event) {
+        super.addListener(event);
+    }
+
+    @ReactMethod
+    public void removeListeners(Integer count) {
+        super.removeListeners(count);
+    }
+
     private boolean getFlagValue(String key) {
-        return InternalAPM._isFeatureEnabledCP(key, "");
+        boolean value = InternalAPM._isFeatureEnabledCP(key, "");
+        Log.d(NET_TAG, "[getFlagValue] key=" + key + ", value=" + value);
+        return value;
     }
 
     private WritableMap convertFromMapToWritableMap(Map<String, Object> map) {
@@ -73,14 +88,24 @@ public class RNLuciqNetworkLoggerModule extends RNLuciqNetworkLoggerBaseSpec {
     /**
      * Get first time Value of [cp_native_interception_enabled] flag
      */
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public boolean isNativeInterceptionEnabled() {
-        try {
-            return getFlagValue(CP_NATIVE_INTERCEPTION_ENABLED);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false; // Will rollback to JS interceptor
-        }
+    @ReactMethod
+    public void isNativeInterceptionEnabled(Promise promise) {
+        Log.d(NET_TAG, "[isNativeInterceptionEnabled] Querying CP_NATIVE_INTERCEPTION_ENABLED flag");
+        MainThreadHandler.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    boolean enabled = getFlagValue(CP_NATIVE_INTERCEPTION_ENABLED);
+                    Log.d(NET_TAG, "[isNativeInterceptionEnabled] Result=" + enabled);
+                    promise.resolve(enabled);
+                } catch (Exception e) {
+                    Log.e(NET_TAG, "[isNativeInterceptionEnabled] Error — falling back to false (JS interceptor)", e);
+                    e.printStackTrace();
+                    promise.resolve(false);
+                }
+
+            }
+        });
     }
 
     /**
@@ -90,14 +115,18 @@ public class RNLuciqNetworkLoggerModule extends RNLuciqNetworkLoggerBaseSpec {
      */
     @ReactMethod
     public void hasAPMNetworkPlugin(Promise promise) {
+        Log.d(NET_TAG, "[hasAPMNetworkPlugin] Querying APM_NETWORK_PLUGIN_INSTALLED flag");
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
                 try {
-                    promise.resolve(getFlagValue(APM_NETWORK_PLUGIN_INSTALLED));
+                    boolean hasPlugin = getFlagValue(APM_NETWORK_PLUGIN_INSTALLED);
+                    Log.d(NET_TAG, "[hasAPMNetworkPlugin] Result=" + hasPlugin);
+                    promise.resolve(hasPlugin);
                 } catch (Exception e) {
+                    Log.e(NET_TAG, "[hasAPMNetworkPlugin] Error — falling back to false", e);
                     e.printStackTrace();
-                    promise.resolve(false);  // Will rollback to JS interceptor
+                    promise.resolve(false);
                 }
 
             }
@@ -106,13 +135,15 @@ public class RNLuciqNetworkLoggerModule extends RNLuciqNetworkLoggerBaseSpec {
 
 
     @ReactMethod
-    public void registerNetworkLogsListener(@androidx.annotation.Nullable String type) {
+    public void registerNetworkLogsListener() {
+        Log.d(NET_TAG, "[registerNetworkLogsListener] Registering network log sanitizer");
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
                 InternalAPM._registerNetworkLogSanitizer((networkLogSnapshot, onCompleteCallback) -> {
                     final String id = String.valueOf(onCompleteCallback.hashCode());
                     callbackMap.put(id, onCompleteCallback);
+                    Log.d(NET_TAG, "[NetworkLogSanitizer] Received snapshot — id=" + id + ", url=" + networkLogSnapshot.getUrl() + ", responseCode=" + networkLogSnapshot.getResponseCode() + ", callbackMapSize=" + callbackMap.size());
 
                     WritableMap networkSnapshotParams = Arguments.createMap();
                     networkSnapshotParams.putString("id", id);
@@ -130,6 +161,7 @@ public class RNLuciqNetworkLoggerModule extends RNLuciqNetworkLoggerBaseSpec {
                     }
 
                     sendEvent(Constants.LCQ_NETWORK_LOGGER_HANDLER, networkSnapshotParams);
+                    Log.d(NET_TAG, "[NetworkLogSanitizer] Sent event to JS: " + Constants.LCQ_NETWORK_LOGGER_HANDLER + " for " + networkLogSnapshot.getUrl());
                 });
             }
         });
@@ -137,10 +169,12 @@ public class RNLuciqNetworkLoggerModule extends RNLuciqNetworkLoggerBaseSpec {
 
     @ReactMethod
     public void resetNetworkLogsListener() {
+        Log.d(NET_TAG, "[resetNetworkLogsListener] Clearing network log sanitizer, callbackMapSize=" + callbackMap.size());
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
                 InternalAPM._registerNetworkLogSanitizer(null);
+                Log.d(NET_TAG, "[resetNetworkLogsListener] Sanitizer cleared");
             }
         });
     }
@@ -151,40 +185,33 @@ public class RNLuciqNetworkLoggerModule extends RNLuciqNetworkLoggerBaseSpec {
             String callbackID,
             String requestBody,
             String responseBody,
-            double responseCode,
+            int responseCode,
             ReadableMap requestHeaders,
             ReadableMap responseHeaders
     ) {
+        Log.d(NET_TAG, "[updateNetworkLogSnapshot] callbackID=" + callbackID + ", url=" + url + ", responseCode=" + responseCode + ", callbackMapSize=" + callbackMap.size());
         try {
-            // Convert ReadableMap to a Java Map for easier handling
             Map<String, Object> requestHeadersMap = convertReadableMapToMap(requestHeaders);
             Map<String, Object> responseHeadersMap = convertReadableMapToMap(responseHeaders);
 
             NetworkLogSnapshot modifiedSnapshot = null;
             if (!url.isEmpty()) {
-                modifiedSnapshot = new NetworkLogSnapshot(url, requestHeadersMap, requestBody, responseHeadersMap, responseBody, (int) responseCode);
+                modifiedSnapshot = new NetworkLogSnapshot(url, requestHeadersMap, requestBody, responseHeadersMap, responseBody, responseCode);
+            } else {
+                Log.d(NET_TAG, "[updateNetworkLogSnapshot] Empty URL — snapshot will be null (request filtered/removed)");
             }
 
             final OnCompleteCallback<NetworkLogSnapshot> callback = callbackMap.get(callbackID);
             if (callback != null) {
                 callback.onComplete(modifiedSnapshot);
                 callbackMap.remove(callbackID);
+                Log.d(NET_TAG, "[updateNetworkLogSnapshot] Callback invoked and removed for " + callbackID + ", remaining=" + callbackMap.size());
+            } else {
+                Log.e(NET_TAG, "[updateNetworkLogSnapshot] No callback found for callbackID=" + callbackID + " — possible leak or duplicate call, mapKeys=" + callbackMap.keySet());
             }
         } catch (Exception e) {
-            // Reject the promise to indicate an error occurred
+            Log.e(NET_TAG, "[updateNetworkLogSnapshot] Exception processing snapshot: " + e.getMessage() + " for callbackID=" + callbackID, e);
             Log.e("IB-CP-Bridge", "LuciqNetworkLogger.updateNetworkLogSnapshot failed to parse the network snapshot object.");
         }
     }
-
-    @ReactMethod
-    public void setNetworkLoggingRequestFilterPredicateIOS(String id, boolean value) {
-    }
-
-    @ReactMethod
-    public void forceStartNetworkLoggingIOS() {
-    }
-
-    @ReactMethod
-    public void forceStopNetworkLoggingIOS() {
-    }
 }