Serialize params when making/queuing native call

Reviewed By: mhorowitz

Differential Revision: D3460507

fbshipit-source-id: a0600ffe3da89791af3eb64fc2973eb6aafa7d2b

Libraries/BatchedBridge/BatchedBridge.js

@@ -12,8 +12,11 @@
 
 const MessageQueue = require('MessageQueue');
 
+const serializeNativeParams = typeof global.__fbBatchedBridgeSerializeNativeParams !== 'undefined';
+
 const BatchedBridge = new MessageQueue(
-  () => global.__fbBatchedBridgeConfig
+  () => global.__fbBatchedBridgeConfig,
+  serializeNativeParams
 );
 
 // TODO: Move these around to solve the cycle in a cleaner way.

Libraries/Utilities/MessageQueue.js

@@ -49,7 +49,7 @@ type Config = {
 };
 
 class MessageQueue {
-  constructor(configProvider: () => Config) {
+  constructor(configProvider: () => Config, serializeNativeParams: boolean) {
     this._callableModules = {};
     this._queue = [[], [], [], 0];
     this._callbacks = [];
@@ -57,6 +57,7 @@ class MessageQueue {
     this._callID = 0;
     this._lastFlush = 0;
     this._eventLoopStartTime = new Date().getTime();
+    this._serializeNativeParams = serializeNativeParams;
 
     if (__DEV__) {
       this._debugInfo = {};
@@ -150,6 +151,7 @@ class MessageQueue {
       onSucc && params.push(this._callbackID);
       this._callbacks[this._callbackID++] = onSucc;
     }
+    var preparedParams = this._serializeNativeParams ? JSON.stringify(params) : params;
 
     if (__DEV__) {
       global.nativeTraceBeginAsyncFlow &&
@@ -159,7 +161,7 @@ class MessageQueue {
 
     this._queue[MODULE_IDS].push(module);
     this._queue[METHOD_IDS].push(method);
-    this._queue[PARAMS].push(params);
+    this._queue[PARAMS].push(preparedParams);
 
     const now = new Date().getTime();
     if (global.nativeFlushQueueImmediate &&

ReactAndroid/src/main/jni/xreact/jni/ProxyExecutor.cpp

@@ -58,6 +58,9 @@ ProxyExecutor::ProxyExecutor(jni::global_ref<jobject>&& executorInstance,
   setGlobalVariable(
     "__fbBatchedBridgeConfig",
     folly::make_unique<JSBigStdString>(detail::toStdString(folly::toJson(config))));
+  setGlobalVariable(
+    "__fbBatchedBridgeSerializeNativeParams",
+    folly::make_unique<JSBigStdString>("1"));
 }
 
 ProxyExecutor::~ProxyExecutor() {

ReactCommon/cxxreact/JSCExecutor.cpp

@@ -119,12 +119,17 @@ JSCExecutor::JSCExecutor(std::shared_ptr<ExecutorDelegate> delegate,
   }
 
   folly::dynamic config =
-    folly::dynamic::object("remoteModuleConfig", std::move(nativeModuleConfig));
+    folly::dynamic::object
+      ("remoteModuleConfig", std::move(nativeModuleConfig));
+
 
   SystraceSection t("setGlobalVariable");
   setGlobalVariable(
     "__fbBatchedBridgeConfig",
     folly::make_unique<JSBigStdString>(detail::toStdString(folly::toJson(config))));
+  setGlobalVariable(
+    "__fbBatchedBridgeSerializeNativeParams",
+    folly::make_unique<JSBigStdString>(""));
 }
 
 JSCExecutor::JSCExecutor(

ReactCommon/cxxreact/MethodCall.cpp

@@ -51,16 +51,20 @@ std::vector<MethodCall> parseMethodCalls(const std::string& json) throw(std::inv
 
   std::vector<MethodCall> methodCalls;
   for (size_t i = 0; i < moduleIds.size(); i++) {
-    auto paramsValue = params[i];
+    if (!params[i].isString()) {
+      throw std::invalid_argument(
+          folly::to<std::string>("Call argument isn't a string"));
+    }
+    auto paramsValue = folly::parseJson(params[i].asString());
     if (!paramsValue.isArray()) {
       throw std::invalid_argument(
-          folly::to<std::string>("Call argument isn't an array"));
+          folly::to<std::string>("Parsed params isn't an array"));
     }
 
     methodCalls.emplace_back(
       moduleIds[i].getInt(),
       methodIds[i].getInt(),
-      std::move(params[i]),
+      std::move(paramsValue),
       callId);
 
     // only incremement callid if contains valid callid as callid is optional