Merge remote-tracking branch 'origin/master'

src/devTools.js

@@ -2,6 +2,7 @@ import { stringify, parse } from 'jsan';
 import socketCluster from 'socketcluster-client';
 import configureStore from './configureStore';
 import { defaultSocketOptions } from './constants';
+import { getHostForRN } from './utils/reactNative';
 
 const ERROR = '@@remotedev/ERROR';
 
@@ -260,7 +261,10 @@ function handleChange(state, liftedState, maxAge) {
 }
 
 export default function devTools(options = {}) {
-  init(options);
+  init({
+    ...options,
+    hostname: getHostForRN(options.hostname)
+  });
   const realtime = typeof options.realtime === 'undefined'
     ? process.env.NODE_ENV === 'development' : options.realtime;
   if (!realtime && !(startOn || sendOn || sendOnError)) return f => f;

src/utils/reactNative.js

@@ -0,0 +1,20 @@
+/*
+ * Get React Native server IP if hostname is `localhost`
+ * On Android emulator, the IP of host is `10.0.2.2` (Genymotion: 10.0.3.2)
+ */
+export function getHostForRN(hostname) {
+  if (
+    (hostname === 'localhost' || hostname === '127.0.0.1') &&
+    typeof window !== 'undefined' &&
+    window.__fbBatchedBridge &&
+    window.__fbBatchedBridge.RemoteModules &&
+    window.__fbBatchedBridge.RemoteModules.AndroidConstants
+  ) {
+    const {
+      ServerHost = hostname
+    } = window.__fbBatchedBridge.RemoteModules.AndroidConstants;
+    return ServerHost.split(':')[0];
+  }
+
+  return hostname;
+}