Download files through RN packager connection

Differential Revision: D4650999

fbshipit-source-id: 298e3e65bfc13a3610a588c9bffb4808fb2135e3

ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java

@@ -32,6 +32,7 @@ import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.network.OkHttpCallUtil;
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
 import com.facebook.react.modules.systeminfo.AndroidInfoHelpers;
+import com.facebook.react.packagerconnection.FileIoHandler;
 import com.facebook.react.packagerconnection.JSPackagerClient;
 
 import org.json.JSONException;
@@ -149,6 +150,7 @@ public class DevServerHelper {
             commandListener.onPokeSamplingProfilerCommand(responder);
           }
         });
+        handlers.putAll(new FileIoHandler().handlers());
 
         mPackagerClient = new JSPackagerClient(getPackagerConnectionURL(), handlers);
         mPackagerClient.init();

ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java

@@ -422,14 +422,6 @@ public class DevSupportManagerImpl implements
           mDevSettings.setFpsDebugEnabled(!mDevSettings.isFpsDebugEnabled());
         }
       });
-    options.put(
-        mApplicationContext.getString(R.string.catalyst_heap_capture),
-        new DevOptionHandler() {
-          @Override
-          public void onOptionSelected() {
-            handleCaptureHeap(null);
-          }
-        });
     options.put(
         mApplicationContext.getString(R.string.catalyst_poke_sampling_profiler),
         new DevOptionHandler() {
@@ -540,11 +532,6 @@ public class DevSupportManagerImpl implements
     return mJSBundleTempFile.getAbsolutePath();
   }
 
-  @Override
-  public String getHeapCaptureUploadUrl() {
-    return mDevServerHelper.getHeapCaptureUploadUrl();
-  }
-
   /**
    * @return {@code true} if {@link com.facebook.react.ReactInstanceManager} should use downloaded JS bundle file
    * instead of using JS file from assets. This may happen when app has not been updated since
@@ -687,7 +674,7 @@ public class DevSupportManagerImpl implements
   }
 
   @Override
-  public void onCaptureHeapCommand(@Nullable final JSPackagerClient.Responder responder) {
+  public void onCaptureHeapCommand(final JSPackagerClient.Responder responder) {
     UiThreadUtil.runOnUiThread(new Runnable() {
       @Override
       public void run() {
@@ -706,14 +693,24 @@ public class DevSupportManagerImpl implements
     });
   }
 
-  private void handleCaptureHeap(@Nullable final JSPackagerClient.Responder responder) {
+  private void handleCaptureHeap(final JSPackagerClient.Responder responder) {
     if (mCurrentContext == null) {
       return;
     }
     JSCHeapCapture heapCapture = mCurrentContext.getNativeModule(JSCHeapCapture.class);
     heapCapture.captureHeap(
       mApplicationContext.getCacheDir().getPath(),
-      JSCHeapUpload.captureCallback(mDevServerHelper.getHeapCaptureUploadUrl(), responder));
+      new JSCHeapCapture.CaptureCallback() {
+        @Override
+        public void onSuccess(File capture) {
+          responder.respond(capture.toString());
+        }
+
+        @Override
+        public void onFailure(JSCHeapCapture.CaptureException error) {
+          responder.error(error.toString());
+        }
+      });
   }
 
   private void handlePokeSamplingProfiler(@Nullable final JSPackagerClient.Responder responder) {

ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java

@@ -109,11 +109,6 @@ public class DisabledDevSupportManager implements DevSupportManager {
     return null;
   }
 
-  @Override
-  public String getHeapCaptureUploadUrl() {
-    return null;
-  }
-
   @Override
   public boolean hasUpToDateJSBundleInCache() {
     return false;

ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapUpload.java

@@ -1,77 +0,0 @@
-/**
- * Copyright (c) 2016-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.
- */
-
-package com.facebook.react.devsupport;
-
-import javax.annotation.Nullable;
-
-import android.util.Log;
-import java.io.File;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import com.facebook.react.packagerconnection.JSPackagerClient;
-
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
-/**
- * Created by cwdick on 7/22/16.
- */
-public class JSCHeapUpload {
-  public static JSCHeapCapture.CaptureCallback captureCallback(
-      final String uploadUrl,
-      @Nullable final JSPackagerClient.Responder responder) {
-    return new JSCHeapCapture.CaptureCallback() {
-      @Override
-      public void onSuccess(File capture) {
-        OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
-        httpClientBuilder.connectTimeout(1, TimeUnit.MINUTES)
-          .writeTimeout(5, TimeUnit.MINUTES)
-          .readTimeout(5, TimeUnit.MINUTES);
-        OkHttpClient httpClient = httpClientBuilder.build();
-        RequestBody body = RequestBody.create(MediaType.parse("application/json"), capture);
-        Request request = new Request.Builder()
-          .url(uploadUrl)
-          .method("POST", body)
-          .build();
-        Call call = httpClient.newCall(request);
-        call.enqueue(new Callback() {
-          @Override
-          public void onFailure(Call call, IOException e) {
-            String message = "Upload of heap capture failed: " + e.toString();
-            Log.e("JSCHeapCapture", message);
-            responder.error(message);
-          }
-
-          @Override
-          public void onResponse(Call call, Response response) throws IOException {
-            if (!response.isSuccessful()) {
-              String message = "Upload of heap capture failed with code " + Integer.toString(response.code()) + ": " + response.body().string();
-              Log.e("JSCHeapCapture", message);
-              responder.error(message);
-            }
-            responder.respond(response.body().string());
-          }
-        });
-      }
-
-      @Override
-      public void onFailure(JSCHeapCapture.CaptureException e) {
-        String message = "Heap capture failed: " + e.toString();
-        Log.e("JSCHeapCapture", message);
-        responder.error(message);
-      }
-    };
-  }
-}

ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java

@@ -40,7 +40,6 @@ public interface DevSupportManager extends NativeModuleCallExceptionHandler {
   String getSourceUrl();
   String getJSBundleURLForRemoteDebugging();
   String getDownloadedJSBundleFile();
-  String getHeapCaptureUploadUrl();
   boolean hasUpToDateJSBundleInCache();
   void reloadSettings();
   void handleReloadJS();