Merge branch 'master' into sergeyd/android-utf8-conversion-fix

Author: dryganets

Libraries/BatchedBridge/BatchedBridge.js

@@ -12,7 +12,21 @@
 'use strict';
 
 const MessageQueue = require('MessageQueue');
-const BatchedBridge = new MessageQueue();
+
+// MessageQueue can install a global handler to catch all exceptions where JS users can register their own behavior
+// This handler makes all exceptions to be handled inside MessageQueue rather than by the VM at its origin
+// This makes stacktraces to be placed at MessageQueue rather than at where they were launched
+// The parameter __fbUninstallRNGlobalErrorHandler is passed to MessageQueue to prevent the handler from being installed
+//
+// __fbUninstallRNGlobalErrorHandler is conditionally set by the Inspector while the VM is paused for intialization
+// If the Inspector isn't present it defaults to undefined and the global error handler is installed
+// The Inspector can still call MessageQueue#uninstallGlobalErrorHandler to uninstalled on attach
+
+const BatchedBridge = new MessageQueue(
+  // $FlowFixMe
+  typeof __fbUninstallRNGlobalErrorHandler !== 'undefined' &&
+    __fbUninstallRNGlobalErrorHandler === true, // eslint-disable-line no-undef
+);
 
 // Wire up the batched bridge on the global object so that we can call into it.
 // Ideally, this would be the inverse relationship. I.e. the native environment

Libraries/BatchedBridge/MessageQueue.js

@@ -59,14 +59,21 @@ class MessageQueue {
 
   __spy: ?(data: SpyData) => void;
 
-  constructor() {
+  __guard: (() => void) => void;
+
+  constructor(shouldUninstallGlobalErrorHandler: boolean = false) {
     this._lazyCallableModules = {};
     this._queue = [[], [], [], 0];
     this._successCallbacks = [];
     this._failureCallbacks = [];
     this._callID = 0;
     this._lastFlush = 0;
     this._eventLoopStartTime = new Date().getTime();
+    if (shouldUninstallGlobalErrorHandler) {
+      this.uninstallGlobalErrorHandler();
+    } else {
+      this.installGlobalErrorHandler();
+    }
 
     if (__DEV__) {
       this._debugInfo = {};
@@ -252,11 +259,26 @@ class MessageQueue {
     }
   }
 
+  uninstallGlobalErrorHandler() {
+    this.__guard = this.__guardUnsafe;
+  }
+
+  installGlobalErrorHandler() {
+    this.__guard = this.__guardSafe;
+  }
+
   /**
    * Private methods
    */
 
-  __guard(fn: () => void) {
+  // Lets exceptions propagate to be handled by the VM at the origin
+  __guardUnsafe(fn: () => void) {
+    this._inCall++;
+    fn();
+    this._inCall--;
+  }
+
+  __guardSafe(fn: () => void) {
     this._inCall++;
     try {
       fn();

Libraries/BatchedBridge/__tests__/MessageQueue-test.js

@@ -7,6 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @emails oncall+react_native
+ * @format
  */
 'use strict';
 
@@ -38,10 +39,12 @@ describe('MessageQueue', function() {
     queue = new MessageQueue();
     queue.registerCallableModule(
       'MessageQueueTestModule',
-      MessageQueueTestModule
+      MessageQueueTestModule,
     );
-    queue.createDebugLookup(0, 'MessageQueueTestModule',
-      ['testHook1', 'testHook2']);
+    queue.createDebugLookup(0, 'MessageQueueTestModule', [
+      'testHook1',
+      'testHook2',
+    ]);
   });
 
   it('should enqueue native calls', () => {
@@ -65,7 +68,15 @@ describe('MessageQueue', function() {
 
   it('should call the stored callback', () => {
     let done = false;
-    queue.enqueueNativeCall(0, 1, [], () => {}, () => { done = true; });
+    queue.enqueueNativeCall(
+      0,
+      1,
+      [],
+      () => {},
+      () => {
+        done = true;
+      },
+    );
     queue.__invokeCallback(1, []);
     expect(done).toEqual(true);
   });
@@ -83,32 +94,92 @@ describe('MessageQueue', function() {
   });
 
   it('should throw when calling with unknown module', () => {
-    const unknownModule = 'UnknownModule', unknownMethod = 'UnknownMethod';
+    const unknownModule = 'UnknownModule',
+      unknownMethod = 'UnknownMethod';
     expect(() => queue.__callFunction(unknownModule, unknownMethod)).toThrow(
       `Module ${unknownModule} is not a registered callable module (calling ${unknownMethod})`,
     );
   });
 
   it('should return lazily registered module', () => {
-    const dummyModule = {}, name = 'modulesName';
+    const dummyModule = {},
+      name = 'modulesName';
     queue.registerLazyCallableModule(name, () => dummyModule);
 
     expect(queue.getCallableModule(name)).toEqual(dummyModule);
   });
 
   it('should not initialize lazily registered module before it was used for the first time', () => {
-    const dummyModule = {}, name = 'modulesName';
+    const dummyModule = {},
+      name = 'modulesName';
     const factory = jest.fn(() => dummyModule);
     queue.registerLazyCallableModule(name, factory);
     expect(factory).not.toHaveBeenCalled();
   });
 
   it('should initialize lazily registered module only once', () => {
-    const dummyModule = {}, name = 'modulesName';
+    const dummyModule = {},
+      name = 'modulesName';
     const factory = jest.fn(() => dummyModule);
     queue.registerLazyCallableModule(name, factory);
     queue.getCallableModule(name);
     queue.getCallableModule(name);
     expect(factory).toHaveBeenCalledTimes(1);
   });
+
+  it('should catch all exceptions if the global error handler is installed', () => {
+    const errorMessage = 'intentional error';
+    const errorModule = {
+      explode: function() {
+        throw new Error(errorMessage);
+      },
+    };
+    const name = 'errorModuleName';
+    const factory = jest.fn(() => errorModule);
+    queue.__guardSafe = jest.fn(() => {});
+    queue.__guardUnsafe = jest.fn(() => {});
+    queue.installGlobalErrorHandler();
+    queue.registerLazyCallableModule(name, factory);
+    queue.callFunctionReturnFlushedQueue(name, 'explode', []);
+    expect(queue.__guardUnsafe).toHaveBeenCalledTimes(0);
+    expect(queue.__guardSafe).toHaveBeenCalledTimes(2);
+  });
+
+  it('should propagate exceptions if the global error handler is uninstalled', () => {
+    queue.uninstallGlobalErrorHandler();
+    const errorMessage = 'intentional error';
+    const errorModule = {
+      explode: function() {
+        throw new Error(errorMessage);
+      },
+    };
+    const name = 'errorModuleName';
+    const factory = jest.fn(() => errorModule);
+    queue.__guardUnsafe = jest.fn(() => {});
+    queue.__guardSafe = jest.fn(() => {});
+    queue.registerLazyCallableModule(name, factory);
+    queue.uninstallGlobalErrorHandler();
+    queue.callFunctionReturnFlushedQueue(name, 'explode');
+    expect(queue.__guardUnsafe).toHaveBeenCalledTimes(2);
+    expect(queue.__guardSafe).toHaveBeenCalledTimes(0);
+  });
+
+  it('should catch all exceptions if the global error handler is re-installed', () => {
+    const errorMessage = 'intentional error';
+    const errorModule = {
+      explode: function() {
+        throw new Error(errorMessage);
+      },
+    };
+    const name = 'errorModuleName';
+    const factory = jest.fn(() => errorModule);
+    queue.__guardUnsafe = jest.fn(() => {});
+    queue.__guardSafe = jest.fn(() => {});
+    queue.registerLazyCallableModule(name, factory);
+    queue.uninstallGlobalErrorHandler();
+    queue.installGlobalErrorHandler();
+    queue.callFunctionReturnFlushedQueue(name, 'explode');
+    expect(queue.__guardUnsafe).toHaveBeenCalledTimes(0);
+    expect(queue.__guardSafe).toHaveBeenCalledTimes(2);
+  });
 });

Libraries/Image/RCTImageLoader.h

@@ -38,6 +38,18 @@ typedef dispatch_block_t RCTImageLoaderCancellationBlock;
 
 @end
 
+/**
+ * If available, RCTImageRedirectProtocol is invoked before loading an asset.
+ * Implementation should return either a new URL or nil when redirection is
+ * not needed.
+ */
+
+@protocol RCTImageRedirectProtocol
+
+- (NSURL *)redirectAssetsURL:(NSURL *)URL;
+
+@end
+
 @interface UIImage (React)
 
 @property (nonatomic, copy) CAKeyframeAnimation *reactKeyframeAnimation;
@@ -71,6 +83,9 @@ typedef dispatch_block_t RCTImageLoaderCancellationBlock;
  */
 @property (nonatomic, assign) NSUInteger maxConcurrentDecodingBytes;
 
+- (instancetype)init;
+- (instancetype)initWithRedirectDelegate:(id<RCTImageRedirectProtocol>)redirectDelegate NS_DESIGNATED_INITIALIZER;
+
 /**
  * Loads the specified image at the highest available resolution.
  * Can be called from any thread, will call back on an unspecified thread.

Libraries/Image/RCTImageLoader.m

@@ -48,12 +48,26 @@ @implementation RCTImageLoader
     NSMutableArray *_pendingDecodes;
     NSInteger _scheduledDecodes;
     NSUInteger _activeBytes;
+  __weak id<RCTImageRedirectProtocol> _redirectDelegate;
 }
 
 @synthesize bridge = _bridge;
 
 RCT_EXPORT_MODULE()
 
+- (instancetype)init
+{
+  return [self initWithRedirectDelegate:nil];
+}
+
+- (instancetype)initWithRedirectDelegate:(id<RCTImageRedirectProtocol>)redirectDelegate
+{
+    if (self = [super init]) {
+        _redirectDelegate = redirectDelegate;
+    }
+    return self;
+}
+
 - (void)setUp
 {
     // Set defaults
@@ -316,6 +330,9 @@ - (RCTImageLoaderCancellationBlock)_loadImageOrDataWithURLRequest:(NSURLRequest
         if (request.URL.fileURL && request.URL.pathExtension.length == 0) {
             mutableRequest.URL = [request.URL URLByAppendingPathExtension:@"png"];
         }
+        if (_redirectDelegate != nil) {
+            mutableRequest.URL = [_redirectDelegate redirectAssetsURL:mutableRequest.URL];
+        }
         request = mutableRequest;
     }
 

Libraries/RCTTest/RCTTestRunner.m

@@ -117,12 +117,15 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
   __weak RCTBridge *batchedBridge;
 
   @autoreleasepool {
-    __block NSString *error = nil;
+    __block NSMutableArray<NSString *> *errors = nil;
     RCTLogFunction defaultLogFunction = RCTGetLogFunction();
     RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
       defaultLogFunction(level, source, fileName, lineNumber, message);
       if (level >= RCTLogLevelError) {
-        error = message;
+        if (errors == nil) {
+          errors = [NSMutableArray new];
+        }
+        [errors addObject:message];
       }
     });
 
@@ -155,7 +158,7 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
     }
 
     NSDate *date = [NSDate dateWithTimeIntervalSinceNow:kTestTimeoutSeconds];
-    while (date.timeIntervalSinceNow > 0 && testModule.status == RCTTestStatusPending && error == nil) {
+    while (date.timeIntervalSinceNow > 0 && testModule.status == RCTTestStatusPending && errors == nil) {
       [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
       [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
     }
@@ -173,9 +176,9 @@ - (void)runTest:(SEL)test module:(NSString *)moduleName
 #endif
 
     if (expectErrorBlock) {
-      RCTAssert(expectErrorBlock(error), @"Expected an error but nothing matched.");
+      RCTAssert(expectErrorBlock(errors[0]), @"Expected an error but the first one was missing or did not match.");
     } else {
-      RCTAssert(error == nil, @"RedBox error: %@", error);
+      RCTAssert(errors == nil, @"RedBox errors: %@", errors);
       RCTAssert(testModule.status != RCTTestStatusPending, @"Test didn't finish within %0.f seconds", kTestTimeoutSeconds);
       RCTAssert(testModule.status == RCTTestStatusPassed, @"Test failed");
     }

Libraries/Utilities/PlatformOS.android.js

@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule PlatformOS
+ * @flow
+ */
+
+'use strict';
+
+export type PlatformSelectSpec<A, I> = {|
+  android: A,
+  ios: I,
+|};
+
+const PlatformOS = {
+  OS: 'android',
+  select: <A, I> (spec: PlatformSelectSpec<A, I>): A | I => spec.android,
+};
+
+module.exports = PlatformOS;

Libraries/Utilities/PlatformOS.ios.js

@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule PlatformOS
+ * @flow
+ */
+
+'use strict';
+
+export type PlatformSelectSpec<A, I> = {|
+  android: A,
+  ios: I,
+|};
+
+const PlatformOS = {
+  OS: 'ios',
+  select: <A, I> (spec: PlatformSelectSpec<A, I>): A | I => spec.ios,
+};
+
+module.exports = PlatformOS;