@sentry/react-native 6.1.0 → 6.3.0-beta.1

package/ios/RNSentryBreadcrumb.h

@@ -6,8 +6,8 @@
 
 @interface RNSentryBreadcrumb : NSObject
 
-+ (SentryBreadcrumb *)from: (NSDictionary *) dict;
++ (SentryBreadcrumb *)from:(NSDictionary *)dict;
 
-+ (NSString *_Nullable) getCurrentScreenFrom: (NSDictionary *) dict;
++ (NSString *_Nullable)getCurrentScreenFrom:(NSDictionary *)dict;
 
 @end

package/ios/RNSentryBreadcrumb.m

@@ -3,11 +3,11 @@
 
 @implementation RNSentryBreadcrumb
 
-+(SentryBreadcrumb*) from: (NSDictionary *) dict
++ (SentryBreadcrumb *)from:(NSDictionary *)dict
 {
-    SentryBreadcrumb* crumb = [[SentryBreadcrumb alloc] init];
+    SentryBreadcrumb *crumb = [[SentryBreadcrumb alloc] init];
 
-    NSString * levelString = dict[@"level"];
+    NSString *levelString = dict[@"level"];
     SentryLevel sentryLevel;
     if ([levelString isEqualToString:@"fatal"]) {
         sentryLevel = kSentryLevelFatal;
@@ -23,6 +23,12 @@
 
     [crumb setLevel:sentryLevel];
     [crumb setCategory:dict[@"category"]];
+    id origin = dict[@"origin"];
+    if (origin != nil) {
+        [crumb setOrigin:origin];
+    } else {
+        [crumb setOrigin:@"react-native"];
+    }
     [crumb setType:dict[@"type"]];
     [crumb setMessage:dict[@"message"]];
     [crumb setData:dict[@"data"]];
@@ -30,13 +36,14 @@
     return crumb;
 }
 
-+ (NSString *_Nullable) getCurrentScreenFrom: (NSDictionary<NSString*, id> *_Nonnull) dict {
++ (NSString *_Nullable)getCurrentScreenFrom:(NSDictionary<NSString *, id> *_Nonnull)dict
+{
     NSString *_Nullable maybeCategory = [dict valueForKey:@"category"];
     if (![maybeCategory isEqualToString:@"navigation"]) {
         return nil;
     }
 
-    NSDictionary<NSString*, id> *_Nullable maybeData = [dict valueForKey:@"data"];
+    NSDictionary<NSString *, id> *_Nullable maybeData = [dict valueForKey:@"data"];
     if (![maybeData isKindOfClass:[NSDictionary class]]) {
         return nil;
     }
@@ -45,7 +52,7 @@
     if (![maybeCurrentScreen isKindOfClass:[NSString class]]) {
         return nil;
     }
-    
+
     return maybeCurrentScreen;
 }
 

package/ios/RNSentryDependencyContainer.h

@@ -5,13 +5,13 @@
 @interface RNSentryDependencyContainer : NSObject
 SENTRY_NO_INIT
 
-@property (class, readonly, strong) RNSentryDependencyContainer* sharedInstance;
+@property (class, readonly, strong) RNSentryDependencyContainer *sharedInstance;
 
 #if SENTRY_HAS_UIKIT
 
 @property (nonatomic, strong) RNSentryFramesTrackerListener *framesTrackerListener;
 
-- (void)initializeFramesTrackerListenerWith:(RNSentryEmitNewFrameEvent) eventEmitter;
+- (void)initializeFramesTrackerListenerWith:(RNSentryEmitNewFrameEvent)eventEmitter;
 
 #endif
 

package/ios/RNSentryDependencyContainer.m

@@ -2,8 +2,8 @@
 #import <Sentry/SentryDependencyContainer.h>
 
 @implementation RNSentryDependencyContainer {
-     NSObject *sentryDependencyContainerLock;
- }
+    NSObject *sentryDependencyContainerLock;
+}
 
 + (instancetype)sharedInstance
 {
@@ -25,10 +25,11 @@
 
 - (void)initializeFramesTrackerListenerWith:(RNSentryEmitNewFrameEvent)eventEmitter
 {
-  @synchronized(sentryDependencyContainerLock) {
-    _framesTrackerListener = [[RNSentryFramesTrackerListener alloc] initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
-                                                                                andEventEmitter: eventEmitter];
-  }
+    @synchronized(sentryDependencyContainerLock) {
+        _framesTrackerListener = [[RNSentryFramesTrackerListener alloc]
+            initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
+                        andEventEmitter:eventEmitter];
+    }
 }
 
 #endif

package/ios/RNSentryFramesTrackerListener.h

@@ -2,18 +2,18 @@
 
 #if SENTRY_HAS_UIKIT
 
-#import <Foundation/Foundation.h>
-#import <React/RCTEventEmitter.h>
-#import <Sentry/SentryFramesTracker.h>
+#    import <Foundation/Foundation.h>
+#    import <React/RCTEventEmitter.h>
+#    import <Sentry/SentryFramesTracker.h>
 
 typedef void (^RNSentryEmitNewFrameEvent)(NSNumber *newFrameTimestampInSeconds);
 
 @interface RNSentryFramesTrackerListener : NSObject <SentryFramesTrackerListener>
 
-- (instancetype)initWithSentryFramesTracker:(SentryFramesTracker *) framesTracker
-                            andEventEmitter:(RNSentryEmitNewFrameEvent) emitNewFrameEvent;
+- (instancetype)initWithSentryFramesTracker:(SentryFramesTracker *)framesTracker
+                            andEventEmitter:(RNSentryEmitNewFrameEvent)emitNewFrameEvent;
 
-- (void) startListening;
+- (void)startListening;
 
 @property (strong, nonatomic) SentryFramesTracker *framesTracker;
 @property (strong, nonatomic) RNSentryEmitNewFrameEvent emitNewFrameEvent;

package/ios/RNSentryFramesTrackerListener.m

@@ -5,7 +5,7 @@
 @implementation RNSentryFramesTrackerListener
 
 - (instancetype)initWithSentryFramesTracker:(SentryFramesTracker *)framesTracker
-                            andEventEmitter:(RNSentryEmitNewFrameEvent) emitNewFrameEvent;
+                            andEventEmitter:(RNSentryEmitNewFrameEvent)emitNewFrameEvent;
 {
     self = [super init];
     if (self) {
@@ -17,16 +17,18 @@
 
 - (void)framesTrackerHasNewFrame:(NSDate *)newFrameDate
 {
-  [_framesTracker removeListener:self];
-  NSNumber *newFrameTimestampInSeconds = [NSNumber numberWithDouble:[newFrameDate timeIntervalSince1970]];
+    [_framesTracker removeListener:self];
+    NSNumber *newFrameTimestampInSeconds =
+        [NSNumber numberWithDouble:[newFrameDate timeIntervalSince1970]];
 
-  if (_emitNewFrameEvent) {
-      _emitNewFrameEvent(newFrameTimestampInSeconds);
-  }
+    if (_emitNewFrameEvent) {
+        _emitNewFrameEvent(newFrameTimestampInSeconds);
+    }
 }
 
-- (void)startListening {
-  [_framesTracker addListener:self];
+- (void)startListening
+{
+    [_framesTracker addListener:self];
 }
 
 @end

package/ios/RNSentryId.m

@@ -3,7 +3,8 @@
 
 @implementation RNSentryId
 
-+ (SentryId *)newId {
++ (SentryId *)newId
+{
     return [[SentryId alloc] init];
 }
 

package/ios/RNSentryOnDrawReporter.h

@@ -2,9 +2,9 @@
 
 #if SENTRY_HAS_UIKIT
 
-#import <UIKit/UIKit.h>
-#import <React/RCTViewManager.h>
-#import "RNSentryFramesTrackerListener.h"
+#    import "RNSentryFramesTrackerListener.h"
+#    import <React/RCTViewManager.h>
+#    import <UIKit/UIKit.h>
 
 @interface RNSentryOnDrawReporter : RCTViewManager
 
@@ -12,11 +12,11 @@
 
 @interface RNSentryOnDrawReporterView : UIView
 
-@property (nonatomic, strong) RNSentryFramesTrackerListener* framesListener;
+@property (nonatomic, strong) RNSentryFramesTrackerListener *framesListener;
 @property (nonatomic, copy) RCTBubblingEventBlock onDrawNextFrame;
 @property (nonatomic) bool fullDisplay;
 @property (nonatomic) bool initialDisplay;
-@property (nonatomic, weak) RNSentryOnDrawReporter* delegate;
+@property (nonatomic, weak) RNSentryOnDrawReporter *delegate;
 
 @end
 

package/ios/RNSentryOnDrawReporter.m

@@ -2,7 +2,7 @@
 
 #if SENTRY_HAS_UIKIT
 
-#import <Sentry/SentryDependencyContainer.h>
+#    import <Sentry/SentryDependencyContainer.h>
 
 @implementation RNSentryOnDrawReporter
 
@@ -13,45 +13,47 @@ RCT_EXPORT_VIEW_PROPERTY(fullDisplay, BOOL)
 
 - (UIView *)view
 {
-  RNSentryOnDrawReporterView* view = [[RNSentryOnDrawReporterView alloc] init];
-  return view;
+    RNSentryOnDrawReporterView *view = [[RNSentryOnDrawReporterView alloc] init];
+    return view;
 }
 
 @end
 
 @implementation RNSentryOnDrawReporterView
 
-- (instancetype)init {
+- (instancetype)init
+{
     self = [super init];
     if (self) {
         RNSentryEmitNewFrameEvent emitNewFrameEvent = ^(NSNumber *newFrameTimestampInSeconds) {
-          if (self->_fullDisplay) {
-            self.onDrawNextFrame(@{
-              @"newFrameTimestampInSeconds": newFrameTimestampInSeconds,
-              @"type": @"fullDisplay"
-            });
-            return;
-          }
-
-          if (self->_initialDisplay) {
-            self.onDrawNextFrame(@{
-              @"newFrameTimestampInSeconds": newFrameTimestampInSeconds,
-              @"type": @"initialDisplay"
-            });
-            return;
-          }
+            if (self->_fullDisplay) {
+                self.onDrawNextFrame(@{
+                    @"newFrameTimestampInSeconds" : newFrameTimestampInSeconds,
+                    @"type" : @"fullDisplay"
+                });
+                return;
+            }
+
+            if (self->_initialDisplay) {
+                self.onDrawNextFrame(@{
+                    @"newFrameTimestampInSeconds" : newFrameTimestampInSeconds,
+                    @"type" : @"initialDisplay"
+                });
+                return;
+            }
         };
-        _framesListener = [[RNSentryFramesTrackerListener alloc] initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
-                                                                             andEventEmitter:emitNewFrameEvent];
+        _framesListener = [[RNSentryFramesTrackerListener alloc]
+            initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
+                        andEventEmitter:emitNewFrameEvent];
     }
     return self;
 }
 
 - (void)didSetProps:(NSArray<NSString *> *)changedProps
 {
-  if (_fullDisplay || _initialDisplay) {
-    [_framesListener startListening];
-  }
+    if (_fullDisplay || _initialDisplay) {
+        [_framesListener startListening];
+    }
 }
 
 @end

package/ios/RNSentryRNSScreen.h

@@ -2,7 +2,7 @@
 
 #if SENTRY_HAS_UIKIT
 
-#import <Foundation/Foundation.h>
+#    import <Foundation/Foundation.h>
 
 @interface RNSentryRNSScreen : NSObject
 

package/ios/RNSentryRNSScreen.m

@@ -2,28 +2,28 @@
 
 #if SENTRY_HAS_UIKIT
 
-#import <Sentry/SentryFramesTracker.h>
-#import <Sentry/SentryDependencyContainer.h>
-#import <Sentry/SentrySwizzle.h>
+#    import <Sentry/SentryDependencyContainer.h>
+#    import <Sentry/SentryFramesTracker.h>
+#    import <Sentry/SentrySwizzle.h>
 
-#import "RNSentryDependencyContainer.h"
+#    import "RNSentryDependencyContainer.h"
 
 @implementation RNSentryRNSScreen
 
-+ (void)swizzleViewDidAppear {
-  Class rnsscreenclass = NSClassFromString(@"RNSScreen");
-  if (rnsscreenclass == nil)
-  {
-    return;
-  }
-
-  SEL selector = NSSelectorFromString(@"viewDidAppear:");
-  SentrySwizzleInstanceMethod(rnsscreenclass, selector, SentrySWReturnType(void),
-      SentrySWArguments(BOOL animated), SentrySWReplacement({
-          [[[RNSentryDependencyContainer sharedInstance] framesTrackerListener] startListening];
-          SentrySWCallOriginal(animated);
-      }),
-      SentrySwizzleModeOncePerClass, (void *)selector);
++ (void)swizzleViewDidAppear
+{
+    Class rnsscreenclass = NSClassFromString(@"RNSScreen");
+    if (rnsscreenclass == nil) {
+        return;
+    }
+
+    SEL selector = NSSelectorFromString(@"viewDidAppear:");
+    SentrySwizzleInstanceMethod(rnsscreenclass, selector, SentrySWReturnType(void),
+        SentrySWArguments(BOOL animated), SentrySWReplacement({
+            [[[RNSentryDependencyContainer sharedInstance] framesTrackerListener] startListening];
+            SentrySWCallOriginal(animated);
+        }),
+        SentrySwizzleModeOncePerClass, (void *)selector);
 }
 
 @end

package/ios/RNSentryReplay.m

@@ -6,70 +6,59 @@
 @implementation RNSentryReplay {
 }
 
-+ (void)updateOptions:(NSMutableDictionary *)options {
-  NSDictionary *experiments = options[@"_experiments"];
-  [options removeObjectForKey:@"_experiments"];
-  if (experiments == nil) {
-    NSLog(@"Session replay disabled via configuration");
-    return;
-  }
++ (void)updateOptions:(NSMutableDictionary *)options
+{
+    NSDictionary *experiments = options[@"_experiments"];
+    [options removeObjectForKey:@"_experiments"];
+    if (experiments == nil) {
+        NSLog(@"Session replay disabled via configuration");
+        return;
+    }
 
-  if (experiments[@"replaysSessionSampleRate"] == nil &&
-      experiments[@"replaysOnErrorSampleRate"] == nil) {
-    NSLog(@"Session replay disabled via configuration");
-    return;
-  }
+    if (experiments[@"replaysSessionSampleRate"] == nil
+        && experiments[@"replaysOnErrorSampleRate"] == nil) {
+        NSLog(@"Session replay disabled via configuration");
+        return;
+    }
 
-  NSLog(@"Setting up session replay");
-  NSDictionary *replayOptions = options[@"mobileReplayOptions"] ?: @{};
+    NSLog(@"Setting up session replay");
+    NSDictionary *replayOptions = options[@"mobileReplayOptions"] ?: @{};
 
-  [options setValue:@{
-    @"sessionReplay" : @{
-      @"sessionSampleRate" : experiments[@"replaysSessionSampleRate"]
-          ?: [NSNull null],
-      @"errorSampleRate" : experiments[@"replaysOnErrorSampleRate"]
-          ?: [NSNull null],
-      @"redactAllImages" : replayOptions[@"maskAllImages"] ?: [NSNull null],
-      @"redactAllText" : replayOptions[@"maskAllText"] ?: [NSNull null],
+    [options setValue:@{
+        @"sessionReplay" : @ {
+            @"sessionSampleRate" : experiments[@"replaysSessionSampleRate"] ?: [NSNull null],
+            @"errorSampleRate" : experiments[@"replaysOnErrorSampleRate"] ?: [NSNull null],
+            @"maskAllImages" : replayOptions[@"maskAllImages"] ?: [NSNull null],
+            @"maskAllText" : replayOptions[@"maskAllText"] ?: [NSNull null],
+            @"maskedViewClasses" : [RNSentryReplay getReplayRNRedactClasses:replayOptions],
+        }
     }
-  }
-             forKey:@"experimental"];
-
-  [RNSentryReplay addReplayRNRedactClasses:replayOptions];
+               forKey:@"experimental"];
 }
 
-+ (void)addReplayRNRedactClasses:(NSDictionary *_Nullable)replayOptions {
-  NSMutableArray *_Nonnull classesToRedact = [[NSMutableArray alloc] init];
-  if ([replayOptions[@"maskAllVectors"] boolValue] == YES) {
-    Class _Nullable maybeRNSVGViewClass = NSClassFromString(@"RNSVGSvgView");
-    if (maybeRNSVGViewClass != nil) {
-      [classesToRedact addObject:maybeRNSVGViewClass];
-    }
-  }
-  if ([replayOptions[@"maskAllImages"] boolValue] == YES) {
-    Class _Nullable maybeRCTImageClass = NSClassFromString(@"RCTImageView");
-    if (maybeRCTImageClass != nil) {
-      [classesToRedact addObject:maybeRCTImageClass];
++ (NSArray *_Nonnull)getReplayRNRedactClasses:(NSDictionary *_Nullable)replayOptions
+{
+    NSMutableArray *_Nonnull classesToRedact = [[NSMutableArray alloc] init];
+
+    if ([replayOptions[@"maskAllVectors"] boolValue] == YES) {
+        [classesToRedact addObject:@"RNSVGSvgView"];
     }
-  }
-  if ([replayOptions[@"maskAllText"] boolValue] == YES) {
-    Class _Nullable maybeRCTTextClass = NSClassFromString(@"RCTTextView");
-    if (maybeRCTTextClass != nil) {
-      [classesToRedact addObject:maybeRCTTextClass];
+    if ([replayOptions[@"maskAllImages"] boolValue] == YES) {
+        [classesToRedact addObject:@"RCTImageView"];
     }
-    Class _Nullable maybeRCTParagraphComponentViewClass = NSClassFromString(@"RCTParagraphComponentView");
-    if (maybeRCTParagraphComponentViewClass != nil) {
-        [classesToRedact addObject:maybeRCTParagraphComponentViewClass];
+    if ([replayOptions[@"maskAllText"] boolValue] == YES) {
+        [classesToRedact addObject:@"RCTTextView"];
+        [classesToRedact addObject:@"RCTParagraphComponentView"];
     }
-  }
-  [PrivateSentrySDKOnly addReplayRedactClasses:classesToRedact];
+
+    return classesToRedact;
 }
 
-+ (void)postInit {
-  RNSentryReplayBreadcrumbConverter *breadcrumbConverter =
-      [[RNSentryReplayBreadcrumbConverter alloc] init];
-  [PrivateSentrySDKOnly configureSessionReplayWith:breadcrumbConverter
-                                screenshotProvider:nil];
++ (void)postInit
+{
+    RNSentryReplayBreadcrumbConverter *breadcrumbConverter =
+        [[RNSentryReplayBreadcrumbConverter alloc] init];
+    [PrivateSentrySDKOnly configureSessionReplayWith:breadcrumbConverter screenshotProvider:nil];
 }
 
 @end

package/ios/RNSentryReplayBreadcrumbConverter.h

@@ -3,14 +3,13 @@
 #if SENTRY_TARGET_REPLAY_SUPPORTED
 @class SentryRRWebEvent;
 
-@interface RNSentryReplayBreadcrumbConverter
-    : NSObject <SentryReplayBreadcrumbConverter>
+@interface RNSentryReplayBreadcrumbConverter : NSObject <SentryReplayBreadcrumbConverter>
 
 - (instancetype _Nonnull)init;
 
-+ (NSString* _Nullable) getTouchPathMessageFrom:(NSArray* _Nullable) path;
++ (NSString *_Nullable)getTouchPathMessageFrom:(NSArray *_Nullable)path;
 
-- (id<SentryRRWebEvent> _Nullable)convertFrom:(SentryBreadcrumb *_Nonnull) breadcrumb;
+- (id<SentryRRWebEvent> _Nullable)convertFrom:(SentryBreadcrumb *_Nonnull)breadcrumb;
 
 @end
 #endif