noibu-react-native 0.2.20 → 0.2.22

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes of the noibu-react-native SDK release series are documented in this file using
 the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## 0.2.22
+- ** Adds support for new architecture 
+
+## 0.2.21
+- ** ANDROID: Add mapper for expo vector icons
+
 ## 0.2.20
 
 ### Added

package/android/build.gradle

@@ -1,18 +1,4 @@
-buildscript {
-  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["Noibu_kotlinVersion"]
-
-  repositories {
-    google()
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath "com.android.tools.build:gradle:8.5.1"
-    // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-  }
-}
+// Rely on the consuming app's Android Gradle Plugin and Kotlin plugin versions
 
 def isNewArchitectureEnabled() {
   return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
@@ -36,6 +22,8 @@ def getExtOrIntegerDefault(name) {
 android {
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
+  namespace "com.noibu.sessionreplay.reactnative"
+
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
@@ -55,6 +43,17 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+
+  sourceSets {
+    main {
+      java.srcDirs = ["src/main/java"]
+      if (isNewArchitectureEnabled()) {
+        java.srcDirs += ["src/newarch/java"]
+      } else {
+        java.srcDirs += ["src/legacy/java"]
+      }
+    }
+  }
 }
 
 repositories {
@@ -67,13 +66,13 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "com.noibu:sessionreplay-recorder:1.0.1"
+  implementation "com.noibu:sessionreplay-recorder:1.0.2"
 }
 
 if (isNewArchitectureEnabled()) {
   react {
     jsRootDir = file("../src/")
-    libraryName = "noibusessionreplay"
+    libraryName = "NoibuSessionRecorder"
     codegenJavaPackageName = "com.noibu.sessionreplay.reactnative"
   }
 }

package/android/src/{main → legacy}/java/com/noibu/sessionreplay/reactnative/NoibuSessionReplayModule.kt

@@ -5,6 +5,7 @@ import android.os.Looper
 import android.util.Log
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.facebook.react.bridge.ReactMethod
 
 // Update the import statements to point to the KMP shared module's package
 import com.noibu.mobile.android.sessionreplay.Noibu
@@ -52,7 +53,7 @@ class NoibuSessionReplayModule(reactContext: ReactApplicationContext) :
     }
 
     companion object {
-        const val NAME = "NativeSessionRecorder"
+        const val NAME = "NoibuSessionRecorder"
         private var reactContext: ReactApplicationContext? = null
     }
 }

package/android/src/legacy/java/com/noibu/sessionreplay/reactnative/NoibuSessionReplayPackage.kt

@@ -0,0 +1,16 @@
+package com.noibu.sessionreplay.reactnative
+
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ViewManager
+
+class NoibuSessionReplayPackage : ReactPackage {
+  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+    return listOf(NoibuSessionReplayModule(reactContext))
+  }
+
+  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+    return emptyList()
+  }
+}

package/android/src/main/java/com/noibu/sessionreplay/reactnative/NoibuSessionReplayPackage.kt

@@ -1,17 +1 @@
-package com.noibu.sessionreplay.reactnative
-
-import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.JavaScriptModule
-import com.facebook.react.bridge.NativeModule
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.uimanager.ViewManager
-
-class NoibuSessionReplayPackage : ReactPackage {
-  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-    return listOf(NoibuSessionReplayModule(reactContext))
-  }
-
-  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    return emptyList()
-  }
-}
+// This main source directory is intentionally left empty. Actual sources live in src/legacy/java or src/newarch/java.

package/android/src/newarch/java/com/noibu/sessionreplay/reactnative/NoibuSessionRecorderModule.kt

@@ -0,0 +1,47 @@
+package com.noibu.sessionreplay.reactnative
+
+import android.util.Log
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.turbomodule.core.interfaces.TurboModule
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.noibu.mobile.android.sessionreplay.Noibu
+import com.noibu.mobile.android.sessionreplay.NoibuConfig
+
+class NoibuSessionRecorderModule(val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext), TurboModule {
+    companion object {
+        private const val TAG = "NoibuSessionRecorder"
+    }
+
+    init {
+        Log.i(TAG, "[new-arch] Module constructed")
+    }
+
+    override fun getName(): String = "NoibuSessionRecorder"
+
+    @ReactMethod
+    fun initialize(promise: Promise) {
+        Log.i(TAG, "[new-arch] initialize() called")
+        try {
+            val context = currentActivity?.applicationContext ?: reactApplicationContext.applicationContext
+            val config = NoibuConfig(
+                sessionReplayEnabled = true,
+                maskAllTextInputs = false,
+            )
+            Noibu.setup(context, config) { param ->
+                val map = Arguments.createMap()
+                map.putString("message", param)
+                reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                    .emit("noibuRecordingEvent", map)
+                true
+            }
+            promise.resolve(true)
+        } catch (t: Throwable) {
+            Log.e(TAG, "initialize() failed", t)
+            promise.reject("E_INIT", t)
+        }
+    }
+}

package/android/src/newarch/java/com/noibu/sessionreplay/reactnative/NoibuSessionReplayPackage.kt

@@ -0,0 +1,29 @@
+package com.noibu.sessionreplay.reactnative
+
+import com.facebook.react.TurboReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+
+class NoibuSessionReplayPackage : TurboReactPackage() {
+  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+    return if (name == "NoibuSessionRecorder") {
+      NoibuSessionRecorderModule(reactContext)
+    } else null
+  }
+
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider = ReactModuleInfoProvider {
+    mapOf(
+      "NoibuSessionRecorder" to ReactModuleInfo(
+        /* name */ "NoibuSessionRecorder",
+        /* className */ "com.noibu.sessionreplay.reactnative.NoibuSessionRecorderModule",
+        /* canOverrideExistingModule */ false,
+        /* needsEagerInit */ false,
+        /* hasConstants */ false,
+        /* isCxxModule */ false,
+        /* isTurboModule */ true
+      )
+    )
+  }
+}

package/dist/constants.js

@@ -24,7 +24,7 @@ const CONTENT_TYPE = 'content-type';
  * Gets the script id from the cookie object, returns default if cannot be found
  */
 function GET_SCRIPT_ID() {
-    return "1.0.104-rn-sdk-0.2.20" ;
+    return "1.0.104-rn-sdk-0.2.22" ;
 }
 /**
  * Gets the max metro recon number

package/dist/native/NativeNoibuSessionRecorder.d.ts

@@ -0,0 +1,6 @@
+import type { TurboModule } from 'react-native';
+export interface Spec extends TurboModule {
+    initialize(): Promise<boolean>;
+}
+declare const _default: Spec;
+export default _default;

package/dist/native/NativeNoibuSessionRecorder.js

@@ -0,0 +1,6 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { TurboModuleRegistry: TurboModuleRegistryUntyped } = require('react-native');
+const TurboModuleRegistry = TurboModuleRegistryUntyped;
+var TurboNativeSessionRecorder = TurboModuleRegistry.getEnforcing('NoibuSessionRecorder');
+
+export { TurboNativeSessionRecorder as default };

package/dist/sessionRecorder/nativeSessionRecorderSubscription.js

@@ -1,5 +1,6 @@
 import { __rest } from 'tslib';
 import { NativeModules, Platform, NativeEventEmitter } from 'react-native';
+import TurboNativeSessionRecorder from '../native/NativeNoibuSessionRecorder.js';
 import { noibuLog } from '../utils/log.js';
 import { transformToWeb } from '../mobileTransformer/mobile-replay/index.js';
 
@@ -7,7 +8,8 @@ const LINKING_ERROR = `The package 'noibu-session-replay' doesn't seem to be lin
     // Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) + TODO: add back when iOS is supported.
     '- You rebuilt the app after installing the package\n' +
     '- You are not using Expo Go\n';
-const { NativeSessionRecorder, IOSPocEmitter } = NativeModules;
+const { NativeSessionRecorder: LegacyNativeSessionRecorder, IOSPocEmitter } = NativeModules;
+const NativeSessionRecorder = TurboNativeSessionRecorder !== null && TurboNativeSessionRecorder !== void 0 ? TurboNativeSessionRecorder : LegacyNativeSessionRecorder;
 let nativeModuleEmitter;
 const SupportedPlatforms = ['android', 'ios'];
 /** The level of logging to show in the device logcat stream. */
@@ -25,10 +27,11 @@ var LogLevel;
  * Initializes the Noibu - Session recording SDK if the API level is supported.
  */
 function initialize() {
+    var _a;
     if (Platform.OS === 'ios') {
         return;
     }
-    nativeModuleEmitter = new NativeEventEmitter(NativeSessionRecorder);
+    nativeModuleEmitter = new NativeEventEmitter((_a = NativeModules.NativeSessionRecorder) !== null && _a !== void 0 ? _a : NativeSessionRecorder);
     if (!SupportedPlatforms.includes(Platform.OS)) {
         noibuLog(`Noibu - Session recording supports ${SupportedPlatforms.join(', ')} only for now.`);
         return;

package/ios/IOSPocEmitter.m

@@ -1,5 +1,6 @@
 #import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
 
-@interface RCT_EXTERN_MODULE(IOSPocEmitter, NSObject)
+@interface RCT_EXTERN_MODULE(IOSPocEmitter, RCTEventEmitter)
 RCT_EXTERN_METHOD(startIOS)
 @end

package/noibu-react-native.podspec

@@ -20,6 +20,9 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
   s.swift_version = '5.0'
 
+  # Build as static framework to avoid new-arch linking issues
+  s.static_framework = true
+
   #s.vendored_frameworks = "ios/SessionRecorder.xcframework"
   #s.vendored_frameworks = "ios/Noibu.xcframework"
 

package/package.json

@@ -1,14 +1,23 @@
 {
   "name": "noibu-react-native",
-  "version": "0.2.20",
+  "version": "0.2.22",
   "targetNjsVersion": "1.0.104",
   "description": "React-Native SDK for NoibuJS to collect errors in React-Native applications",
   "main": "dist/entry/index.js",
   "types": "dist/entry/index.d.ts",
+  "codegenConfig": {
+    "name": "NoibuSessionRecorder",
+    "type": "modules",
+    "jsSrcsDir": "src",
+    "android": {
+      "javaPackageName": "com.noibu.sessionreplay.reactnative"
+    }
+  },
   "files": [
     "android",
     "android/settings.gradle",
     "dist/*",
+    "src/native/NativeNoibuSessionRecorder.ts",
     "README.md",
     "CHANGELOG.md",
     "ios",

package/src/native/NativeNoibuSessionRecorder.ts

@@ -0,0 +1,20 @@
+// @ts-ignore - Using type from newer React Native versions when building locally
+import type { TurboModule } from 'react-native';
+
+export interface Spec extends TurboModule {
+  initialize(): Promise<boolean>;
+}
+
+// Create a typed facade for TurboModuleRegistry so we can use generics
+type TurboModuleRegistryType = {
+  getEnforcing<T>(name: string): T;
+};
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { TurboModuleRegistry: TurboModuleRegistryUntyped } = require('react-native') as {
+  TurboModuleRegistry: TurboModuleRegistryType;
+};
+
+const TurboModuleRegistry: TurboModuleRegistryType = TurboModuleRegistryUntyped;
+
+export default TurboModuleRegistry.getEnforcing<Spec>('NoibuSessionRecorder');