Use FFI/JNI for captureEnvelope on iOS and Android

CHANGELOG.md

@@ -7,6 +7,10 @@
 - Add `sentry.origin` to logs created by `LoggingIntegration` ([#3153](https://github.com/getsentry/sentry-dart/pull/3153))
 - Tag all spans with thread info on non-web platforms ([#3101](https://github.com/getsentry/sentry-dart/pull/3101), [#3144](https://github.com/getsentry/sentry-dart/pull/3144))
 
+### Enhancements
+
+- Use FFI/JNI for `captureEnvelope` on iOS and Android ([#3115](https://github.com/getsentry/sentry-dart/pull/3115))
+
 ## 9.7.0-beta.1
 
 ### Features

packages/flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt

@@ -63,7 +63,6 @@ class SentryFlutterPlugin :
   ) {
     when (call.method) {
       "initNativeSdk" -> initNativeSdk(call, result)
-      "captureEnvelope" -> captureEnvelope(call, result)
       "loadImageList" -> loadImageList(call, result)
       "closeNativeSdk" -> closeNativeSdk(result)
       "fetchNativeAppStart" -> fetchNativeAppStart(result)
@@ -368,32 +367,6 @@ class SentryFlutterPlugin :
 
     result.success("")
   }
-
-  private fun captureEnvelope(
-    call: MethodCall,
-    result: Result,
-  ) {
-    if (!Sentry.isEnabled()) {
-      result.error("1", "The Sentry Android SDK is disabled", null)
-      return
-    }
-    val args = call.arguments() as List<Any>? ?: listOf()
-    if (args.isNotEmpty()) {
-      val event = args.first() as ByteArray?
-      val containsUnhandledException = args[1] as Boolean
-      if (event != null && event.isNotEmpty()) {
-        val id = InternalSentrySdk.captureEnvelope(event, containsUnhandledException)
-        if (id != null) {
-          result.success("")
-        } else {
-          result.error("2", "Failed to capture envelope", null)
-        }
-        return
-      }
-    }
-    result.error("3", "Envelope is null or empty", null)
-  }
-
   private fun loadImageList(
     call: MethodCall,
     result: Result,

packages/flutter/ffi-jni.yaml

@@ -13,6 +13,7 @@ output:
 log_level: all
 
 classes:
+  - io.sentry.android.core.InternalSentrySdk
   - io.sentry.android.replay.ReplayIntegration
   - io.sentry.flutter.SentryFlutterPlugin
   - android.graphics.Bitmap

packages/flutter/ios/sentry_flutter/Sources/sentry_flutter/SentryFlutterPlugin.swift

@@ -81,9 +81,6 @@ public class SentryFlutterPlugin: NSObject, FlutterPlugin {
         case "closeNativeSdk":
             closeNativeSdk(call, result: result)
 
-        case "captureEnvelope":
-            captureEnvelope(call, result: result)
-
         case "fetchNativeAppStart":
             fetchNativeAppStart(result: result)
 
@@ -412,24 +409,6 @@ public class SentryFlutterPlugin: NSObject, FlutterPlugin {
         return !name.isEmpty
     }
 
-    private func captureEnvelope(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
-        guard let arguments = call.arguments as? [Any],
-              !arguments.isEmpty,
-              let data = (arguments.first as? FlutterStandardTypedData)?.data else {
-            print("Envelope is null or empty!")
-            result(FlutterError(code: "2", message: "Envelope is null or empty", details: nil))
-            return
-        }
-        guard let envelope = PrivateSentrySDKOnly.envelope(with: data) else {
-            print("Cannot parse the envelope data")
-            result(FlutterError(code: "3", message: "Cannot parse the envelope data", details: nil))
-            return
-        }
-        PrivateSentrySDKOnly.capture(envelope)
-        result("")
-        return
-    }
-
     struct TimeSpan {
         var startTimestampMsSinceEpoch: NSNumber
         var stopTimestampMsSinceEpoch: NSNumber

packages/flutter/lib/src/native/cocoa/sentry_native_cocoa.dart

@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'dart:ffi';
 
+import 'package:ffi/ffi.dart';
+import 'package:flutter/foundation.dart';
 import 'package:meta/meta.dart';
 
 import '../../../sentry_flutter.dart';
@@ -52,6 +54,43 @@ class SentryNativeCocoa extends SentryNativeChannel {
     return super.init(hub);
   }
 
+  @override
+  FutureOr<void> captureEnvelope(
+      Uint8List envelopeData, bool containsUnhandledException) {
+    // Use a safe copy-based conversion to avoid crashes due to memory issues observed
+    // when relying on `dataWithBytesNoCopy:length:freeWhenDone:`.
+    final length = envelopeData.length;
+    final buffer = malloc<Uint8>(length);
+    cocoa.NSData? nsData;
+    cocoa.SentryEnvelope? envelope;
+    try {
+      buffer.asTypedList(length).setAll(0, envelopeData);
+      nsData = cocoa.NSData.dataWithBytes_length_(_lib, buffer.cast(), length);
+      envelope = cocoa.PrivateSentrySDKOnly.envelopeWithData_(_lib, nsData);
+      cocoa.PrivateSentrySDKOnly.captureEnvelope_(_lib, envelope);
+    } catch (exception, stackTrace) {
+      options.log(SentryLevel.error, 'Failed to capture envelope',
+          exception: exception, stackTrace: stackTrace);
+
+      if (options.automatedTestMode) {
+        rethrow;
+      }
+    } finally {
+      // Release ObjC wrappers promptly and free the temporary C buffer.
+      if (envelope != null) {
+        try {
+          envelope.release();
+        } catch (_) {}
+      }
+      if (nsData != null) {
+        try {
+          nsData.release();
+        } catch (_) {}
+      }
+      malloc.free(buffer);
+    }
+  }
+
   @override
   FutureOr<void> setReplayConfig(ReplayConfig config) {
     // Note: unused on iOS.