Updated Event Source native implementations: added connect and read timeouts in SSE

android/src/main/java/org/kaazing/gateway/client/impl/http/HttpRequestTransportHandler.java

@@ -1,16 +1,16 @@
 /**
  * Copyright (c) 2007-2014 Kaazing Corporation. All rights reserved.
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -34,67 +34,67 @@ public class HttpRequestTransportHandler extends HttpRequestHandlerAdapter {
     private static final Logger LOG = Logger.getLogger(CLASS_NAME);
 
     public static HttpRequestHandlerFactory DEFAULT_FACTORY = new HttpRequestHandlerFactory() {
-        
+
         @Override
         public HttpRequestHandler createHandler() {
             HttpRequestHandler requestHandler = new HttpRequestTransportHandler();
-            
+
             if (LOG.isLoggable(Level.FINE)) {
                 HttpRequestLoggingHandler loggingHandler = new HttpRequestLoggingHandler();
                 loggingHandler.setNextHandler(requestHandler);
                 requestHandler = loggingHandler;
             }
-            
+
             return requestHandler;
         }
     };
 
     @Override
     public void processOpen(HttpRequest request) {
         LOG.entering(CLASS_NAME, "processOpen: "+request);
-        
+
         HttpRequestHandler transportHandler;
         if (WebSocketTransportHandler.useBridge(request.getUri().getURI())) {
             transportHandler = new HttpRequestBridgeHandler();
         }
-        else {
+        else { // Used by Android
             transportHandler = new HttpRequestDelegateHandler();
         }
-        
+
         request.transportHandler = transportHandler;
 
         transportHandler.setListener(new HttpRequestListener() {
-            
+
             @Override
             public void requestReady(HttpRequest request) {
                 listener.requestReady(request);
             }
-            
+
             @Override
             public void requestProgressed(HttpRequest request, WrappedByteBuffer payload) {
                 listener.requestProgressed(request, payload);
             }
-            
+
             @Override
             public void requestOpened(HttpRequest request) {
                 listener.requestOpened(request);
             }
-            
+
             @Override
             public void requestLoaded(HttpRequest request, HttpResponse response) {
                 listener.requestLoaded(request, response);
             }
-            
+
             @Override
             public void requestClosed(HttpRequest request) {
                 listener.requestClosed(request);
             }
-            
+
             @Override
             public void requestAborted(HttpRequest request) {
                 listener.requestAborted(request);
             }
-            
+
             @Override
             public void errorOccurred(HttpRequest request, Exception exception) {
                 listener.errorOccurred(request, exception);
@@ -107,15 +107,15 @@ public void errorOccurred(HttpRequest request, Exception exception) {
     @Override
     public void processSend(HttpRequest request, WrappedByteBuffer buffer) {
         LOG.entering(CLASS_NAME, "processSend: "+request);
-        
+
         HttpRequestHandler transportHandler = request.transportHandler;
         transportHandler.processSend(request, buffer);
     }
 
     @Override
     public void processAbort(HttpRequest request) {
         LOG.entering(CLASS_NAME, "processAbort: "+request);
-        
+
         HttpRequestHandler transportHandler = request.transportHandler;
         transportHandler.processAbort(request);
     }

android/src/main/java/org/kaazing/gateway/client/transport/http/HttpRequestDelegateImpl.java

@@ -42,6 +42,10 @@
 import org.kaazing.gateway.client.transport.ReadyStateChangedEvent;
 
 public class HttpRequestDelegateImpl implements HttpRequestDelegate {
+
+    private final static int SSE_CONNECT_TIMEOUT_MILLIS = 30000;
+    private final static int SSE_SOCKET_TIMEOUT_MILLIS = 70000;
+
     private static final String CLASS_NAME = HttpRequestDelegateImpl.class.getName();
     private static final Logger LOG = Logger.getLogger(CLASS_NAME);
 
@@ -143,7 +147,11 @@ public void processOpen(String method, URL url, String origin, boolean async, lo
         connection = (HttpURLConnection)url.openConnection();
         connection.setRequestMethod(method);
         connection.setInstanceFollowRedirects(false);
-        connection.setConnectTimeout((int) connectTimeout);
+
+        // Don't use `connectTimeout` param, which is 0 by default
+        connection.setConnectTimeout(SSE_CONNECT_TIMEOUT_MILLIS);
+        // Ably keepalive comments (or heartbeat events if heartbeats=true) are sent every 60 secs aprox.
+        connection.setReadTimeout(SSE_SOCKET_TIMEOUT_MILLIS);
 
         if (!origin.equalsIgnoreCase("null") && !origin.startsWith("privileged")) {
             URL originUrl = new URL(origin);