6.66

-Timeouts tunning

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.tonikelope</groupId>
     <artifactId>MegaBasterd</artifactId>
-    <version>6.65</version>
+    <version>6.66</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>

src/main/java/com/tonikelope/megabasterd/ChunkDownloader.java

@@ -219,9 +219,11 @@ public class ChunkDownloader implements Runnable, SecureSingleThreadNotifiable {
                 }
 
                 if (_current_smart_proxy != null) {
-                    con.setConnectTimeout(Download.HTTP_PROXY_TIMEOUT);
+                    con.setConnectTimeout(Transference.HTTP_PROXY_CONNECT_TIMEOUT);
+                    con.setReadTimeout(Transference.HTTP_PROXY_READ_TIMEOUT);
                 } else {
-                    con.setConnectTimeout(Download.HTTP_TIMEOUT);
+                    con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT);
+                    con.setReadTimeout(Transference.HTTP_READ_TIMEOUT);
                 }
 
                 con.setUseCaches(false);

src/main/java/com/tonikelope/megabasterd/ChunkDownloaderMono.java

@@ -81,7 +81,9 @@ public class ChunkDownloaderMono extends ChunkDownloader {
                             con = (HttpURLConnection) url.openConnection();
                         }
 
-                        con.setConnectTimeout(Download.HTTP_TIMEOUT);
+                        con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT);
+
+                        con.setReadTimeout(Transference.HTTP_READ_TIMEOUT);
 
                         con.setUseCaches(false);
 

src/main/java/com/tonikelope/megabasterd/ChunkUploader.java

@@ -158,7 +158,9 @@ public class ChunkUploader implements Runnable, SecureSingleThreadNotifiable {
 
                 con.setFixedLengthStreamingMode(chunk_size);
 
-                con.setConnectTimeout(Upload.HTTP_TIMEOUT);
+                con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT);
+
+                con.setReadTimeout(Upload.HTTP_READ_TIMEOUT);
 
                 con.setRequestProperty("User-Agent", MainPanel.DEFAULT_USER_AGENT);
 

src/main/java/com/tonikelope/megabasterd/CryptTools.java

@@ -354,7 +354,9 @@ public class CryptTools {
 
                 con.setUseCaches(false);
 
-                con.setConnectTimeout(Upload.HTTP_TIMEOUT);
+                con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT);
+
+                con.setReadTimeout(Transference.HTTP_READ_TIMEOUT);
 
                 con.setRequestProperty("User-Agent", MainPanel.DEFAULT_USER_AGENT);
 
@@ -529,7 +531,9 @@ public class CryptTools {
 
             con.setUseCaches(false);
 
-            con.setConnectTimeout(Upload.HTTP_TIMEOUT);
+            con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT);
+
+            con.setReadTimeout(Transference.HTTP_READ_TIMEOUT);
 
             con.setRequestProperty("User-Agent", "Mozilla/5.0 (X11; U; Linux amd64; rv:44.0) Gecko/20100101 Firefox/44.0");
 

src/main/java/com/tonikelope/megabasterd/MainPanel.java

@@ -53,7 +53,7 @@ import javax.swing.UIManager;
  */
 public final class MainPanel {
 
-    public static final String VERSION = "6.65";
+    public static final String VERSION = "6.66";
     public static final int THROTTLE_SLICE_SIZE = 16 * 1024;
     public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024;
     public static final int STREAMER_PORT = 1337;

src/main/java/com/tonikelope/megabasterd/MegaAPI.java

@@ -414,7 +414,9 @@ public class MegaAPI implements Serializable {
 
                 con.setRequestProperty("Content-type", "text/plain;charset=UTF-8");
 
-                con.setConnectTimeout(Transference.HTTP_TIMEOUT);
+                con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT);
+
+                con.setReadTimeout(Transference.HTTP_READ_TIMEOUT);
 
                 con.setRequestProperty("User-Agent", MainPanel.DEFAULT_USER_AGENT);
 

src/main/java/com/tonikelope/megabasterd/MegaCrypterAPI.java

@@ -55,7 +55,9 @@ public class MegaCrypterAPI {
 
             con.setRequestProperty("Content-type", "application/json");
 
-            con.setConnectTimeout(Transference.HTTP_TIMEOUT);
+            con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT);
+
+            con.setReadTimeout(Transference.HTTP_READ_TIMEOUT);
 
             con.setUseCaches(false);
 

src/main/java/com/tonikelope/megabasterd/MiscTools.java

@@ -904,7 +904,9 @@ public class MiscTools {
 
                 }
 
-                con.setConnectTimeout(Transference.HTTP_TIMEOUT);
+                con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT);
+
+                con.setReadTimeout(Transference.HTTP_READ_TIMEOUT);
 
                 con.setUseCaches(false);
 

src/main/java/com/tonikelope/megabasterd/SmartMegaProxyManager.java

@@ -80,7 +80,9 @@ public final class SmartMegaProxyManager {
 
                 con = (HttpURLConnection) url.openConnection();
 
-                con.setConnectTimeout(Transference.HTTP_TIMEOUT);
+                con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT);
+
+                con.setReadTimeout(Transference.HTTP_READ_TIMEOUT);
 
                 con.setUseCaches(false);
 

src/main/java/com/tonikelope/megabasterd/StreamChunkDownloader.java

@@ -128,7 +128,9 @@ public class StreamChunkDownloader implements Runnable {
                         }
                     }
 
-                    con.setConnectTimeout(Transference.HTTP_TIMEOUT);
+                    con.setConnectTimeout(Transference.HTTP_CONNECT_TIMEOUT);
+
+                    con.setReadTimeout(Transference.HTTP_READ_TIMEOUT);
 
                     con.setUseCaches(false);
 

src/main/java/com/tonikelope/megabasterd/Transference.java

@@ -10,8 +10,10 @@ public interface Transference {
 
     int MIN_WORKERS = 1;
     int MAX_WORKERS = 20;
-    int HTTP_TIMEOUT = 15000;
-    int HTTP_PROXY_TIMEOUT = 15000;
+    int HTTP_CONNECT_TIMEOUT = 15000;
+    int HTTP_PROXY_CONNECT_TIMEOUT = 15000;
+    int HTTP_READ_TIMEOUT = 15000;
+    int HTTP_PROXY_READ_TIMEOUT = 15000;
     int MAX_SIM_TRANSFERENCES = 20;
     int SIM_TRANSFERENCES_DEFAULT = 4;
     boolean LIMIT_TRANSFERENCE_SPEED_DEFAULT = false;

src/main/java/com/tonikelope/megabasterd/Upload.java

@@ -26,6 +26,7 @@ import javax.swing.JComponent;
  */
 public class Upload implements Transference, Runnable, SecureSingleThreadNotifiable {
 
+    public static final int HTTP_READ_TIMEOUT = 30000;
     public static final int WORKERS_DEFAULT = 6;
     public static final int CHUNK_SIZE_MULTI = 1; //Otra cosa da errores al reanudar una subida (investigar)
     private static final Logger LOG = Logger.getLogger(Upload.class.getName());