diff --git a/README.md b/README.md index bdea142..971be2e 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Add this dependency to your project's POM: com.browserstack browserstack-local-java - 1.1.4 + 1.1.5 ``` diff --git a/pom.xml b/pom.xml index e4fc19b..c372100 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.browserstack browserstack-local-java jar - 1.1.4-SNAPSHOT + 1.1.5 browserstack-local-java Java bindings for BrowserStack Local diff --git a/src/main/java/com/browserstack/local/Local.java b/src/main/java/com/browserstack/local/Local.java index 8e4cb34..7669007 100644 --- a/src/main/java/com/browserstack/local/Local.java +++ b/src/main/java/com/browserstack/local/Local.java @@ -23,7 +23,7 @@ public class Local { private LocalProcess proc = null; // Current version of binding package, used for --source option of binary - private final String packageVersion = "1.1.4"; + private static final String packageVersion = "1.1.5"; private final Map parameters; private final Map avoidValueParameters; @@ -130,6 +130,15 @@ public boolean isRunning() throws Exception { return isProcessRunning(pid); } + /** + * Returns the package version + * + * @return {String} package version + */ + public static String getPackageVersion() { + return packageVersion; + } + /** * Creates a list of command-line arguments for the Local instance * diff --git a/src/main/java/com/browserstack/local/LocalBinary.java b/src/main/java/com/browserstack/local/LocalBinary.java index 5f088d0..6b7a0fb 100644 --- a/src/main/java/com/browserstack/local/LocalBinary.java +++ b/src/main/java/com/browserstack/local/LocalBinary.java @@ -1,12 +1,19 @@ package com.browserstack.local; import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; + import java.io.IOException; +import java.io.InputStream; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.File; +import java.io.FileOutputStream; import java.net.URL; +import java.net.URLConnection; import java.util.regex.Pattern; +import java.util.zip.GZIPInputStream; +import java.util.zip.ZipException; class LocalBinary { @@ -58,7 +65,8 @@ private void initialize() throws LocalException { throw new LocalException("Failed to detect OS type"); } - httpPath = BIN_URL + binFileName; + String sourceURL = BIN_URL; + httpPath = sourceURL + binFileName; } private boolean isAlpine() { @@ -174,7 +182,7 @@ private void downloadBinary(String destParentDir, Boolean custom) throws LocalEx URL url = new URL(httpPath); File f = new File(source); - FileUtils.copyURLToFile(url, f); + newCopyToFile(url, f); changePermissions(binaryPath); } catch (Exception e) { @@ -192,4 +200,38 @@ private void changePermissions(String path) { public String getBinaryPath() { return binaryPath; } + + private static void newCopyToFile(URL url, File f) throws IOException { + URLConnection conn = url.openConnection(); + conn.setRequestProperty("User-Agent", "browserstack-local-java/" + Local.getPackageVersion()); + conn.setRequestProperty("Accept-Encoding", "gzip, *"); + String contentEncoding = conn.getContentEncoding(); + + if (contentEncoding == null || !contentEncoding.toLowerCase().contains("gzip")) { + customCopyInputStreamToFile(conn.getInputStream(), f, url); + return; + } + + try (InputStream stream = new GZIPInputStream(conn.getInputStream())) { + if (System.getenv().containsKey("BROWSERSTACK_LOCAL_DEBUG_GZIP")) { + System.out.println("using gzip in " + conn.getRequestProperty("User-Agent")); + } + + customCopyInputStreamToFile(stream, f, url); + } catch (ZipException e) { + FileUtils.copyURLToFile(url, f); + } + } + + private static void customCopyInputStreamToFile(InputStream stream, File file, URL url) throws IOException { + try { + FileUtils.copyInputStreamToFile(stream, file); + } catch (Throwable e) { + try (FileOutputStream fos = new FileOutputStream(file)) { + IOUtils.copy(stream, fos); + } catch (Throwable th) { + FileUtils.copyURLToFile(url, file); + } + } + } }