chore(8_1_X): update aps-analytics (#11179)

* chore: update aps-analytics * fix(ios): improve uncaught exception stack traces * build(lint): fix formatting
tidev · Aug 29, 2019 · 0148ee6 · 0148ee6
1 parent 3ec42b5
commit 0148ee6
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 11 deletions.
diff --git a/android/titanium/lib/aps-analytics.jar b/android/titanium/lib/aps-analytics.jar
diff --git a/iphone/TitaniumKit/TitaniumKit/Libraries/APSAnalytics/libAPSAnalytics.a b/iphone/TitaniumKit/TitaniumKit/Libraries/APSAnalytics/libAPSAnalytics.a
diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiExceptionHandler.h b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiExceptionHandler.h
@@ -44,6 +44,11 @@
  */
 @property (nonatomic, readonly) NSString *backtrace;
 
+/**
+ * Returns the native stack as a static string.
+ */
+@property (nonatomic, readonly) NSArray<NSString *> *nativeStack;
+
 - (id)initWithMessage:(NSString *)message sourceURL:(NSString *)sourceURL lineNo:(NSInteger)lineNo;
 - (id)initWithDictionary:(NSDictionary *)dictionary;
 

diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiExceptionHandler.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiExceptionHandler.m
@@ -1,6 +1,6 @@
 /**
  * Appcelerator Titanium Mobile
- * Copyright (c) 2009-2015 by Appcelerator, Inc. All Rights Reserved.
+ * Copyright (c) 2009-2019 by Axway, Inc. All Rights Reserved.
  * Licensed under the terms of the Apache Public License
  * Please see the LICENSE included with this distribution for details.
  */
@@ -43,16 +43,30 @@ + (TiExceptionHandler *)defaultExceptionHandler
 
 - (void)reportException:(NSException *)exception
 {
-  NSArray *stackTrace = [exception callStackSymbols];
-  NSString *message = [NSString stringWithFormat:
-                                    @"[ERROR] The application has crashed with an uncaught exception '%@'.\nReason:\n%@\nStack trace:\n\n%@\n",
-                                exception.name, exception.reason, [stackTrace componentsJoinedByString:@"\n"]];
-  NSLog(@"%@", message);
-  id<TiExceptionHandlerDelegate> currentDelegate = _delegate;
-  if (currentDelegate == nil) {
-    currentDelegate = self;
+  // attempt to generate a script error, which includes JS stack information
+  JSContext *context = [JSContext currentContext];
+  JSValue *jsError = [JSValue valueWithNewErrorFromMessage:[exception reason] inContext:context];
+  @try {
+    TiScriptError *error = [TiUtils scriptErrorValue:@{
+      @"message" : [exception reason],
+      @"sourceURL" : [[jsError valueForProperty:@"sourceURL"] toString],
+      @"line" : [[jsError valueForProperty:@"line"] toNumber],
+      @"column" : [[jsError valueForProperty:@"column"] toNumber],
+      @"stack" : [[jsError valueForProperty:@"stack"] toString],
+      @"nativeStack" : [exception callStackSymbols]
+    }];
+    [self reportScriptError:error];
+
+    // cant generate script error, fallback to default behaviour
+  } @catch (NSException *e) {
+    id<TiExceptionHandlerDelegate> currentDelegate = _delegate;
+    if (currentDelegate == nil) {
+      currentDelegate = self;
+    }
+    [currentDelegate handleUncaughtException:exception];
+    return;
   }
-  [currentDelegate handleUncaughtException:exception];
+  [prevUncaughtExceptionHandler handleUncaughtException:exception];
 }
 
 - (void)reportScriptError:(TiScriptError *)scriptError
@@ -68,7 +82,10 @@ - (void)reportScriptError:(TiScriptError *)scriptError
 
 - (void)showScriptError:(TiScriptError *)error
 {
-  NSArray<NSString *> *exceptionStackTrace = [NSThread callStackSymbols];
+  NSArray<NSString *> *exceptionStackTrace = [error valueForKey:@"nativeStack"];
+  if (exceptionStackTrace == nil) {
+    exceptionStackTrace = [NSThread callStackSymbols];
+  }
 
   if (exceptionStackTrace == nil) {
     [[TiApp app] showModalError:[error description]];
@@ -127,6 +144,7 @@ @implementation TiScriptError
 @synthesize column = _column;
 @synthesize dictionaryValue = _dictionaryValue;
 @synthesize backtrace = _backtrace;
+@synthesize nativeStack = _nativeStack;
 
 - (id)initWithMessage:(NSString *)message sourceURL:(NSString *)sourceURL lineNo:(NSInteger)lineNo
 {
@@ -155,6 +173,7 @@ - (id)initWithDictionary:(NSDictionary *)dictionary
     if (_backtrace == nil) {
       _backtrace = [[[dictionary objectForKey:@"stack"] description] copy];
     }
+    _nativeStack = [[dictionary objectForKey:@"nativeStack"] copy];
     _dictionaryValue = [dictionary copy];
   }
   return self;
@@ -166,6 +185,7 @@ - (void)dealloc
   RELEASE_TO_NIL(_sourceURL);
   RELEASE_TO_NIL(_backtrace);
   RELEASE_TO_NIL(_dictionaryValue);
+  RELEASE_TO_NIL(_nativeStack);
   [super dealloc];
 }
 
@@ -205,10 +225,14 @@ - (NSString *)detailedDescription
 //
 // thanks to: http://www.restoroot.com/Blog/2008/10/18/crash-reporter-for-iphone-applications/
 //
+static BOOL uncaughtException = NO;
 static void TiUncaughtExceptionHandler(NSException *exception)
 {
   static BOOL insideException = NO;
 
+  // prevent signal handler repeating exception
+  uncaughtException = YES;
+
   // prevent recursive exceptions
   if (insideException) {
     exit(1);
@@ -217,6 +241,7 @@ static void TiUncaughtExceptionHandler(NSException *exception)
   insideException = YES;
 
   [[TiExceptionHandler defaultExceptionHandler] reportException:exception];
+  [[APSAnalytics sharedInstance] flush];
 
   insideException = NO;
   if (prevUncaughtExceptionHandler != NULL) {
@@ -232,6 +257,11 @@ static void TiUncaughtExceptionHandler(NSException *exception)
 
 static void TiSignalHandler(int code)
 {
+  // already caught exception, no need for signal exception
+  if (uncaughtException) {
+    signal(code, SIG_DFL);
+    return;
+  }
   NSException *exception = [NSException exceptionWithName:@"SIGNAL_ERROR" reason:[NSString stringWithFormat:@"signal error code: %d", code] userInfo:nil];
   [[TiExceptionHandler defaultExceptionHandler] reportException:exception];
   [[APSAnalytics sharedInstance] flush];

diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiUtils.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiUtils.m
@@ -2117,6 +2117,12 @@ + (UIImage *)imageWithColor:(UIColor *)color
 
 + (id)stripInvalidJSONPayload:(id)jsonPayload
 {
+  NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+  dateFormatter.locale = [NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"];
+  dateFormatter.timeZone = [NSTimeZone timeZoneForSecondsFromGMT:0];
+  // ISO08601 formatting, same as Javascript stringified new Date()
+  dateFormatter.dateFormat = @"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+
   if ([jsonPayload isKindOfClass:[NSDictionary class]]) {
     NSMutableDictionary *result = [NSMutableDictionary new];
     for (NSString *key in [jsonPayload allKeys]) {
@@ -2125,6 +2131,9 @@ + (id)stripInvalidJSONPayload:(id)jsonPayload
         value = [TiUtils stripInvalidJSONPayload:value];
       }
       if ([self isSupportedFragment:value]) {
+        if ([value isKindOfClass:[NSDate class]]) {
+          value = [dateFormatter stringFromDate:value];
+        }
         [result setObject:value forKey:key];
       } else {
         DebugLog(@"[WARN] Found invalid attribute \"%@\" that cannot be serialized, skipping it ...", key)
@@ -2138,6 +2147,9 @@ + (id)stripInvalidJSONPayload:(id)jsonPayload
         value = [TiUtils stripInvalidJSONPayload:value];
       }
       if ([self isSupportedFragment:value]) {
+        if ([value isKindOfClass:[NSDate class]]) {
+          value = [dateFormatter stringFromDate:value];
+        }
         [result addObject:value];
       } else {
         DebugLog(@"[WARN] Found invalid value \"%@\" that cannot be serialized, skipping it ...", value);