CronetBidirectionalStream

library/java/org/chromium/net/impl/BUILD

@@ -12,8 +12,11 @@ android_library(
         "Annotations.java",
         "AtomicCombinatoryState.java",
         "BidirectionalStreamBuilderImpl.java",
+        "BidirectionalStreamNetworkException.java",
         "CallbackExceptionImpl.java",
         "CancelProofEnvoyStream.java",
+        "CronetBidirectionalState.java",
+        "CronetBidirectionalStream.java",
         "CronetEngineBase.java",
         "CronetEngineBuilderImpl.java",
         "CronetExceptionImpl.java",

library/java/org/chromium/net/impl/BidirectionalStreamNetworkException.java

@@ -5,7 +5,7 @@
 /**
  * Used in {@link CronetBidirectionalStream}. Implements {@link NetworkExceptionImpl}.
  */
-final class BidirectionalStreamNetworkException extends NetworkExceptionImpl {
+public final class BidirectionalStreamNetworkException extends NetworkExceptionImpl {
   public BidirectionalStreamNetworkException(String message, int errorCode,
                                              int cronetInternalErrorCode) {
     super(message, errorCode, cronetInternalErrorCode);

library/java/org/chromium/net/impl/CronetUrlRequest.java

@@ -94,11 +94,10 @@ public final class CronetUrlRequest extends UrlRequestBase {
   }
 
   private static final String X_ENVOY = "x-envoy";
-  private static final String X_ENVOY_SELECTED_TRANSPORT = "x-android-selected-transport";
+  private static final String X_ENVOY_UPSTREAM_ALPN = "x-envoy-upstream-alpn";
   private static final String TAG = CronetUrlRequest.class.getSimpleName();
   private static final String USER_AGENT = "User-Agent";
   private static final String CONTENT_TYPE = "Content-Type";
-  private static final ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.allocateDirect(0);
   private static final Executor DIRECT_EXECUTOR = new DirectExecutor();
 
   private final String mUserAgent;
@@ -142,8 +141,6 @@ public final class CronetUrlRequest extends UrlRequestBase {
   private final AtomicCombinatoryState mReportState =
       new AtomicCombinatoryState(ReportState.REPORT_READY);
 
-  private final AtomicBoolean mUploadProviderClosed = new AtomicBoolean(false);
-
   private final boolean mAllowDirectExecutor;
 
   /* These don't change with redirects */
@@ -183,10 +180,9 @@ public final class CronetUrlRequest extends UrlRequestBase {
 
   /**
    * @param executor The executor for orchestrating tasks between envoy-mobile callbacks
-   * @param userExecutor The executor used to dispatch to Cronet {@code callback}
    */
-  CronetUrlRequest(CronetUrlRequestContext cronvoyEngine, Callback callback, Executor executor,
-                   String url, String userAgent, boolean allowDirectExecutor,
+  CronetUrlRequest(CronetUrlRequestContext cronvoyEngine, String url, Callback callback,
+                   Executor executor, String userAgent, boolean allowDirectExecutor,
                    Collection<Object> connectionAnnotations, boolean trafficStatsTagSet,
                    int trafficStatsTag, boolean trafficStatsUidSet, int trafficStatsUid,
                    RequestFinishedInfo.Listener requestFinishedListener) {
@@ -1051,7 +1047,7 @@ private void setUrlResponseInfo(Map<String, List<String>> responseHeaders, int r
         if (headerEntry.getValue().get(0) == null) {
           continue;
         }
-        if (X_ENVOY_SELECTED_TRANSPORT.equals(headerKey)) {
+        if (X_ENVOY_UPSTREAM_ALPN.equals(headerKey)) {
           selectedTransport = headerEntry.getValue().get(0);
         }
         if (!headerKey.startsWith(X_ENVOY) && !headerKey.equals("date") &&
@@ -1064,9 +1060,7 @@ private void setUrlResponseInfo(Map<String, List<String>> responseHeaders, int r
       // Important to copy the list here, because although we never concurrently modify
       // the list ourselves, user code might iterate over it while we're redirecting, and
       // that would throw ConcurrentModificationException.
-      // TODO(https://github.com/envoyproxy/envoy-mobile/issues/1426) set receivedByteCount
       // TODO(https://github.com/envoyproxy/envoy-mobile/issues/1622) support proxy
-      // TODO(https://github.com/envoyproxy/envoy-mobile/issues/1546) negotiated protocol
       // TODO(https://github.com/envoyproxy/envoy-mobile/issues/1578) http caching
       mUrlResponseInfo.setResponseValues(
           new ArrayList<>(mUrlChain), responseCode, HttpReason.getReason(responseCode),

library/java/org/chromium/net/impl/CronetUrlRequestContext.java

@@ -120,14 +120,17 @@ void setTaskToExecuteWhenInitializationIsCompleted(Runnable runnable) {
   @Override
   public UrlRequestBase
   createRequest(String url, UrlRequest.Callback callback, Executor executor, int priority,
-                Collection<Object> connectionAnnotations, boolean disableCache,
+                Collection<Object> requestAnnotations, boolean disableCache,
                 boolean disableConnectionMigration, boolean allowDirectExecutor,
                 boolean trafficStatsTagSet, int trafficStatsTag, boolean trafficStatsUidSet,
                 int trafficStatsUid, RequestFinishedInfo.Listener requestFinishedListener,
                 int idempotency) {
-    return new CronetUrlRequest(this, callback, executor, url, mUserAgent, allowDirectExecutor,
-                                connectionAnnotations, trafficStatsTagSet, trafficStatsTag,
-                                trafficStatsUidSet, trafficStatsUid, requestFinishedListener);
+    synchronized (mLock) {
+      checkHaveAdapter();
+      return new CronetUrlRequest(this, url, callback, executor, mUserAgent, allowDirectExecutor,
+                                  requestAnnotations, trafficStatsTagSet, trafficStatsTag,
+                                  trafficStatsUidSet, trafficStatsUid, requestFinishedListener);
+    }
   }
 
   @Override
@@ -136,16 +139,22 @@ void setTaskToExecuteWhenInitializationIsCompleted(Runnable runnable) {
                             String httpMethod, List<Map.Entry<String, String>> requestHeaders,
                             @StreamPriority int priority,
                             boolean delayRequestHeadersUntilFirstFlush,
-                            Collection<Object> connectionAnnotations, boolean trafficStatsTagSet,
+                            Collection<Object> requestAnnotations, boolean trafficStatsTagSet,
                             int trafficStatsTag, boolean trafficStatsUidSet, int trafficStatsUid) {
-    throw new UnsupportedOperationException("Can't create a bidi stream yet.");
+    synchronized (mLock) {
+      checkHaveAdapter();
+      return new CronetBidirectionalStream(
+          this, url, priority, callback, executor, mUserAgent, httpMethod, requestHeaders,
+          delayRequestHeadersUntilFirstFlush, requestAnnotations, trafficStatsTagSet,
+          trafficStatsTag, trafficStatsUidSet, trafficStatsUid);
+    }
   }
 
   @Override
   public ExperimentalBidirectionalStream.Builder
   newBidirectionalStreamBuilder(String url, BidirectionalStream.Callback callback,
                                 Executor executor) {
-    throw new UnsupportedOperationException("Can't create a bidi stream yet.");
+    return new BidirectionalStreamBuilderImpl(url, callback, executor, this);
   }
 
   @Override
@@ -327,7 +336,7 @@ private static void postObservationTaskToExecutor(Executor executor, Runnable ta
     try {
       executor.execute(task);
     } catch (RejectedExecutionException failException) {
-      // TODO(carloseltuerto): use Envoy-Mobile logs - this is a hack.
+      // TODO: use Envoy-Mobile logs - this is a hack.
       android.util.Log.e(CronetUrlRequestContext.LOG_TAG, "Exception posting task to executor",
                          failException);
     }

test/java/org/chromium/net/BUILD

@@ -83,3 +83,27 @@ envoy_mobile_android_test(
         "//test/java/org/chromium/net/testing",
     ],
 )
+
+envoy_mobile_android_test(
+    name = "bidirectional_stream_test",
+    srcs = [
+        "BidirectionalStreamTest.java",
+    ],
+    exec_properties = {
+        # TODO(lfpino): Remove this once the sandboxNetwork=off works for ipv4 localhost addresses.
+        "sandboxNetwork": "standard",
+    },
+    native_deps = [
+        "//library/common/jni:libndk_envoy_jni.so",
+        "//library/common/jni:libndk_envoy_jni.jnilib",
+    ],
+    deps = [
+        "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib",
+        "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib",
+        "//library/java/org/chromium/net",
+        "//library/java/org/chromium/net/impl:cronvoy",
+        "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib",
+        "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib",
+        "//test/java/org/chromium/net/testing",
+    ],
+)