From e4f58ec2908d95a852297498c44670b6310ffdd5 Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Thu, 16 Jan 2020 16:05:26 +0100 Subject: [PATCH 01/22] Initial commit --- .gitattributes | 6 + .gitignore | 12 +- build.gradle | 34 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 183 ++++++++ gradlew.bat | 100 +++++ settings.gradle | 10 + .../fdossena/speedtest/core/Speedtest.java | 203 +++++++++ .../speedtest/core/base/Connection.java | 237 ++++++++++ .../fdossena/speedtest/core/base/Utils.java | 18 + .../core/config/SpeedtestConfig.java | 415 ++++++++++++++++++ .../core/config/TelemetryConfig.java | 55 +++ .../core/download/DownloadStream.java | 106 +++++ .../speedtest/core/download/Downloader.java | 73 +++ .../fdossena/speedtest/core/getIP/GetIP.java | 59 +++ .../fdossena/speedtest/core/log/Logger.java | 18 + .../speedtest/core/ping/PingStream.java | 99 +++++ .../fdossena/speedtest/core/ping/Pinger.java | 47 ++ .../core/serverSelector/ServerSelector.java | 115 +++++ .../core/serverSelector/TestPoint.java | 65 +++ .../speedtest/core/telemetry/Telemetry.java | 74 ++++ .../speedtest/core/upload/UploadStream.java | 105 +++++ .../speedtest/core/upload/Uploader.java | 73 +++ .../core/worker/SpeedtestWorker.java | 277 ++++++++++++ 25 files changed, 2388 insertions(+), 2 deletions(-) create mode 100644 .gitattributes create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/fdossena/speedtest/core/Speedtest.java create mode 100644 src/main/java/com/fdossena/speedtest/core/base/Connection.java create mode 100644 src/main/java/com/fdossena/speedtest/core/base/Utils.java create mode 100644 src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java create mode 100644 src/main/java/com/fdossena/speedtest/core/config/TelemetryConfig.java create mode 100644 src/main/java/com/fdossena/speedtest/core/download/DownloadStream.java create mode 100644 src/main/java/com/fdossena/speedtest/core/download/Downloader.java create mode 100644 src/main/java/com/fdossena/speedtest/core/getIP/GetIP.java create mode 100644 src/main/java/com/fdossena/speedtest/core/log/Logger.java create mode 100644 src/main/java/com/fdossena/speedtest/core/ping/PingStream.java create mode 100644 src/main/java/com/fdossena/speedtest/core/ping/Pinger.java create mode 100644 src/main/java/com/fdossena/speedtest/core/serverSelector/ServerSelector.java create mode 100644 src/main/java/com/fdossena/speedtest/core/serverSelector/TestPoint.java create mode 100644 src/main/java/com/fdossena/speedtest/core/telemetry/Telemetry.java create mode 100644 src/main/java/com/fdossena/speedtest/core/upload/UploadStream.java create mode 100644 src/main/java/com/fdossena/speedtest/core/upload/Uploader.java create mode 100644 src/main/java/com/fdossena/speedtest/core/worker/SpeedtestWorker.java diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..00a51af --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# These are explicitly windows files and should use crlf +*.bat text eol=crlf + diff --git a/.gitignore b/.gitignore index 098af8c..1b0c302 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,12 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build + +# Intellij Files +.idea +*.iml + /_PRIVATE .directory - - diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..5760c51 --- /dev/null +++ b/build.gradle @@ -0,0 +1,34 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This generated file contains a sample Java Library project to get you started. + * For more details take a look at the Java Libraries chapter in the Gradle + * User Manual available at https://docs.gradle.org/6.1/userguide/java_library_plugin.html + */ + +plugins { + // Apply the java-library plugin to add support for Java Library + id 'java-library' +} + +repositories { + // Use jcenter for resolving dependencies. + // You can declare any Maven/Ivy/file repository here. + jcenter() +} + +dependencies { + + implementation group: 'org.json', name: 'json', version: '20190722' + + // Use JUnit Jupiter API for testing. + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2' + + // Use JUnit Jupiter Engine for testing. + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.2' +} + +test { + // Use junit platform for unit tests + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f3d88b1c2faf2fc91d853cd5d4242b5547257070 GIT binary patch literal 58695 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..f149949 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Jan 16 16:00:12 CET 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..2fe81a7 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed 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 +# +# https://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 KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9618d8d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..dbbcbf6 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user manual at https://docs.gradle.org/6.1/userguide/multi_project_builds.html + */ + +rootProject.name = 'LibreSpeed' diff --git a/src/main/java/com/fdossena/speedtest/core/Speedtest.java b/src/main/java/com/fdossena/speedtest/core/Speedtest.java new file mode 100644 index 0000000..dae6064 --- /dev/null +++ b/src/main/java/com/fdossena/speedtest/core/Speedtest.java @@ -0,0 +1,203 @@ +package com.fdossena.speedtest.core; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; + +import com.fdossena.speedtest.core.config.SpeedtestConfig; +import com.fdossena.speedtest.core.config.TelemetryConfig; +import com.fdossena.speedtest.core.serverSelector.ServerSelector; +import com.fdossena.speedtest.core.serverSelector.TestPoint; +import com.fdossena.speedtest.core.worker.SpeedtestWorker; + +public class Speedtest { + private ArrayList servers=new ArrayList<>(); + private TestPoint selectedServer=null; + private SpeedtestConfig config=new SpeedtestConfig(); + private TelemetryConfig telemetryConfig=new TelemetryConfig(); + private int state=0; //0=configs, 1=test points, 2=server selection, 3=ready, 4=testing, 5=finished + + private Object mutex=new Object(); + + private String originalExtra=""; + + public Speedtest(){ + + } + + public void setSpeedtestConfig(SpeedtestConfig c){ + synchronized (mutex){ + if(state!=0) throw new IllegalStateException("Cannot change config at this moment"); + config=c.clone(); + String extra=config.getTelemetry_extra(); + if(extra!=null&&!extra.isEmpty()) originalExtra=extra; + } + } + + public void setTelemetryConfig(TelemetryConfig c){ + synchronized (mutex) { + if (state != 0) throw new IllegalStateException("Cannot change config at this moment"); + telemetryConfig = c.clone(); + } + } + + public void addTestPoint(TestPoint t){ + synchronized (mutex) { + if (state == 0) state = 1; + if (state > 1) throw new IllegalStateException("Cannot add test points at this moment"); + servers.add(t); + } + } + + public void addTestPoints(TestPoint[] s){ + synchronized (mutex) { + for (TestPoint t : s) addTestPoint(t); + } + } + + public void addTestPoint(JSONObject json){ + synchronized (mutex) { + addTestPoint(new TestPoint(json)); + } + } + + public void addTestPoints(JSONArray json){ + synchronized (mutex) { + for (int i = 0; i < json.length(); i++) + try { + addTestPoint(json.getJSONObject(i)); + } catch (JSONException t) { + } + } + } + + public TestPoint[] getTestPoints(){ + synchronized (mutex) { + return servers.toArray(new TestPoint[0]); + } + } + + private ServerSelector ss=null; + public void selectServer(final ServerSelectedHandler callback){ + synchronized (mutex) { + if (state == 0) throw new IllegalStateException("No test points added"); + if (state == 2) throw new IllegalStateException("Server selection is in progress"); + if (state > 2) throw new IllegalStateException("Server already selected"); + state = 2; + ss = new ServerSelector(getTestPoints(), config.getPing_connectTimeout()) { + @Override + public void onServerSelected(TestPoint server) { + selectedServer = server; + synchronized (mutex) { + if (server != null) state = 3; else state = 1; + } + callback.onServerSelected(server); + } + }; + ss.start(); + } + } + + public void setSelectedServer(TestPoint t){ + synchronized (mutex) { + if (state == 2) throw new IllegalStateException("Server selection is in progress"); + if (t == null) throw new IllegalArgumentException("t is null"); + selectedServer = t; + state = 3; + } + } + + private SpeedtestWorker st=null; + public void start(final SpeedtestHandler callback){ + synchronized (mutex) { + if (state < 3) throw new IllegalStateException("Server hasn't been selected yet"); + if (state == 4) throw new IllegalStateException("Test already running"); + state = 4; + try { + JSONObject extra = new JSONObject(); + if (originalExtra != null && !originalExtra.isEmpty()) + extra.put("extra", originalExtra); + extra.put("server", selectedServer.getName()); + config.setTelemetry_extra(extra.toString()); + } catch (Throwable t) { + } + st = new SpeedtestWorker(selectedServer, config, telemetryConfig) { + @Override + public void onDownloadUpdate(double dl, double progress) { + callback.onDownloadUpdate(dl, progress); + } + + @Override + public void onUploadUpdate(double ul, double progress) { + callback.onUploadUpdate(ul, progress); + } + + @Override + public void onPingJitterUpdate(double ping, double jitter, double progress) { + callback.onPingJitterUpdate(ping, jitter, progress); + } + + @Override + public void onIPInfoUpdate(String ipInfo) { + callback.onIPInfoUpdate(ipInfo); + } + + @Override + public void onTestIDReceived(String id) { + String shareURL=prepareShareURL(telemetryConfig); + if(shareURL!=null) shareURL=String.format(shareURL,id); + callback.onTestIDReceived(id,shareURL); + } + + @Override + public void onEnd() { + synchronized (mutex) { + state = 5; + } + callback.onEnd(); + } + + @Override + public void onCriticalFailure(String err) { + synchronized (mutex) { + state = 5; + } + callback.onCriticalFailure(err); + } + }; + } + } + + private String prepareShareURL(TelemetryConfig c){ + if(c==null) return null; + String server=c.getServer(), shareURL=c.getShareURL(); + if(server==null||server.isEmpty()||shareURL==null||shareURL.isEmpty()) return null; + if(!server.endsWith("/")) server=server+"/"; + while(shareURL.startsWith("/")) shareURL=shareURL.substring(1); + if(server.startsWith("//")) server="https:"+server; + return server+shareURL; + } + + public void abort(){ + synchronized (mutex) { + if (state == 2) ss.stopASAP(); + if (state == 4) st.abort(); + state = 5; + } + } + + public static abstract class ServerSelectedHandler{ + public abstract void onServerSelected(TestPoint server); + } + public static abstract class SpeedtestHandler{ + public abstract void onDownloadUpdate(double dl, double progress); + public abstract void onUploadUpdate(double ul, double progress); + public abstract void onPingJitterUpdate(double ping, double jitter, double progress); + public abstract void onIPInfoUpdate(String ipInfo); + public abstract void onTestIDReceived(String id, String shareURL); + public abstract void onEnd(); + public abstract void onCriticalFailure(String err); + } +} diff --git a/src/main/java/com/fdossena/speedtest/core/base/Connection.java b/src/main/java/com/fdossena/speedtest/core/base/Connection.java new file mode 100644 index 0000000..132be25 --- /dev/null +++ b/src/main/java/com/fdossena/speedtest/core/base/Connection.java @@ -0,0 +1,237 @@ +package com.fdossena.speedtest.core.base; + +import android.os.Build; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintStream; +import java.net.InetSocketAddress; +import java.net.Socket; +import java.net.URL; +import java.util.HashMap; +import java.util.Locale; + +import javax.net.SocketFactory; +import javax.net.ssl.SSLSocketFactory; + +public class Connection { + private Socket socket; + private String host; private int port; + private int mode=MODE_NOT_SET; + private static final int MODE_NOT_SET=0, MODE_HTTP=1, MODE_HTTPS=2; + + private static final String USER_AGENT="Speedtest-Android/1.1.3 (SDK "+Build.VERSION.SDK_INT+"; "+Build.PRODUCT+"; Android "+Build.VERSION.RELEASE+")", + LOCALE= Build.VERSION.SDK_INT>=21?Locale.getDefault().toLanguageTag():null; + + public Connection(String url, int connectTimeout, int soTimeout, int recvBuffer, int sendBuffer){ + boolean tryHTTP=false, tryHTTPS=false; + Locale.getDefault().toString(); + if(url.startsWith("http://")){ + tryHTTP=true; + try{ + URL u=new URL(url); + host=u.getHost(); + port=u.getPort(); + }catch(Throwable t){ + throw new IllegalArgumentException("Malformed URL (HTTP)"); + } + }else if(url.startsWith("https://")){ + tryHTTPS=true; + try{ + URL u=new URL(url); + host=u.getHost(); + port=u.getPort(); + }catch(Throwable t){ + throw new IllegalArgumentException("Malformed URL (HTTPS)"); + } + }else if(url.startsWith("//")){ + tryHTTP=true; + tryHTTPS=true; + try{ + URL u=new URL("http:"+url); + host=u.getHost(); + port=u.getPort(); + }catch(Throwable t){ + throw new IllegalArgumentException("Malformed URL (HTTP/HTTPS)"); + } + }else{ + throw new IllegalArgumentException("Malformed URL (Unknown or unspecified protocol)"); + } + try{ + if(tryHTTPS){ + SocketFactory factory = SSLSocketFactory.getDefault(); + socket=factory.createSocket(); + if(connectTimeout>0){ + socket.connect(new InetSocketAddress(host, port==-1?443:port),connectTimeout); + }else{ + socket.connect(new InetSocketAddress(host, port==-1?443:port)); + } + mode=MODE_HTTPS; + } + }catch(Throwable t){} + try{ + if(tryHTTP){ + SocketFactory factory = SocketFactory.getDefault(); + socket=factory.createSocket(); + if(connectTimeout>0) { + socket.connect(new InetSocketAddress(host, port == -1 ? 80 : port), connectTimeout); + }else{ + socket.connect(new InetSocketAddress(host, port == -1 ? 80 : port)); + } + mode=MODE_HTTP; + } + }catch(Throwable t){} + if(mode==MODE_NOT_SET) throw new IllegalStateException("Failed to connect"); + if(soTimeout>0) { + try { + socket.setSoTimeout(soTimeout); + } catch(Throwable t){} + } + if(recvBuffer>0){ + try{ + socket.setReceiveBufferSize(recvBuffer); + }catch(Throwable t){} + } + if(sendBuffer>0){ + try{ + socket.setSendBufferSize(sendBuffer); + }catch(Throwable t){} + } + } + + private static final int DEFAULT_CONNECT_TIMEOUT=2000, DEFAULT_SO_TIMEOUT=5000; + public Connection(String url){ + this(url,DEFAULT_CONNECT_TIMEOUT,DEFAULT_SO_TIMEOUT,-1,-1); + } + + public InputStream getInputStream(){ + try{ + return socket.getInputStream(); + }catch (Throwable t){ + return null; + } + } + + public OutputStream getOutputStream(){ + try{ + return socket.getOutputStream(); + }catch (Throwable t){ + return null; + } + } + + private PrintStream ps=null; + public PrintStream getPrintStream(){ + if(ps==null){ + try{ + ps=new PrintStream(getOutputStream(),false,"utf-8"); + }catch(Throwable t){ + ps=null; + } + } + return ps; + } + private InputStreamReader isr=null; + public InputStreamReader getInputStreamReader(){ + if(isr==null){ + try{ + isr=new InputStreamReader(getInputStream(),"utf-8"); + }catch(Throwable t){ + isr=null; + } + } + return isr; + } + + public void GET(String path, boolean keepAlive) throws Exception{ + try{ + if(!path.startsWith("/")) path="/"+path; + PrintStream ps=getPrintStream(); + ps.print("GET "+path+" HTTP/1.1\r\n"); + ps.print("Host: "+host+"\r\n"); + ps.print("User-Agent: "+USER_AGENT); + ps.print("Connection: "+(keepAlive?"keep-alive":"close")+"\r\n"); + ps.print("Accept-Encoding: identity\r\n"); + if(LOCALE!=null) ps.print("Accept-Language: "+LOCALE+"\r\n"); + ps.print("\r\n"); + ps.flush(); + }catch (Throwable t){ + throw new Exception("Failed to send GET request"); + } + } + + public void POST(String path, boolean keepAlive, String contentType, long contentLength) throws Exception{ + try{ + if(!path.startsWith("/")) path="/"+path; + PrintStream ps=getPrintStream(); + ps.print("POST "+path+" HTTP/1.1\r\n"); + ps.print("Host: "+host+"\r\n"); + ps.print("User-Agent: "+USER_AGENT+"\r\n"); + ps.print("Connection: "+(keepAlive?"keep-alive":"close")+"\r\n"); + ps.print("Accept-Encoding: identity\r\n"); + if(LOCALE!=null) ps.print("Accept-Language: "+LOCALE+"\r\n"); + if(contentType!=null) ps.print("Content-Type: "+contentType+"\r\n"); + ps.print("Content-Encoding: identity\r\n"); + if(contentLength>=0) ps.print("Content-Length: "+contentLength+"\r\n"); + ps.print("\r\n"); + ps.flush(); + }catch (Throwable t){ + throw new Exception("Failed to send POST request"); + } + } + + public String readLineUnbuffered(){ + try { + InputStreamReader in = getInputStreamReader(); + StringBuilder sb=new StringBuilder(); + while(true){ + int c=in.read(); + if(c==-1) break; + sb.append((char)c); + if(c=='\n') break; + } + return sb.toString(); + }catch(Throwable t){ + return null; + } + } + + public HashMap parseResponseHeaders() throws Exception{ + try{ + HashMap ret=new HashMap<>(); + String s=readLineUnbuffered(); + if(!s.contains("200 OK")) throw new Exception("Did not receive an HTTP 200 ("+s.trim()+")"); + while(true){ + s=readLineUnbuffered(); + if(s.trim().isEmpty()) break; + if(s.contains(":")){ + ret.put(s.substring(0,s.indexOf(":")).trim().toLowerCase(),s.substring(s.indexOf(":")+1).trim()); + } + } + return ret; + }catch(Throwable t){ + throw new Exception("Failed to get response headers ("+t+")"); + } + } + + public void close(){ + try{ + socket.close(); + }catch(Throwable t){} + socket=null; + } + + public String getHost() { + return host; + } + + public int getPort() { + return port; + } + + public int getMode() { + return mode; + } + +} diff --git a/src/main/java/com/fdossena/speedtest/core/base/Utils.java b/src/main/java/com/fdossena/speedtest/core/base/Utils.java new file mode 100644 index 0000000..51d5cd2 --- /dev/null +++ b/src/main/java/com/fdossena/speedtest/core/base/Utils.java @@ -0,0 +1,18 @@ +package com.fdossena.speedtest.core.base; + +import java.net.URLEncoder; + +public class Utils { + public static String urlEncode(String s){ + try{return URLEncoder.encode(s, "utf-8");}catch(Throwable t){return null;} + } + public static void sleep(long ms){ + try{Thread.sleep(ms);}catch (Throwable t){} + } + public static void sleep(long ms, int ns){ + try{Thread.sleep(ms,ns);}catch (Throwable t){} + } + public static String url_sep(String url){ + if(url.contains("?")) return "&"; else return "?"; + } +} diff --git a/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java b/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java new file mode 100644 index 0000000..c7d7584 --- /dev/null +++ b/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java @@ -0,0 +1,415 @@ +package com.fdossena.speedtest.core.config; + +import org.json.JSONException; +import org.json.JSONObject; + +public class SpeedtestConfig { + private int dl_ckSize=100, ul_ckSize=20; + private int dl_parallelStreams=3, ul_parallelStreams=3; + private int dl_streamDelay=300, ul_streamDelay=300; + private double dl_graceTime=1.5, ul_graceTime=1.5; + private int dl_connectTimeout=5000, dl_soTimeout=10000, ul_connectTimeout=5000, ul_soTimeout=10000, ping_connectTimeout=2000, ping_soTimeout=5000; + private int dl_recvBuffer=-1, dl_sendBuffer=-1, ul_recvBuffer=-1, ul_sendBuffer=16384, ping_recvBuffer=-1, ping_sendBuffer=-1; + private String errorHandlingMode=ONERROR_ATTEMPT_RESTART; + public static final String ONERROR_FAIL="fail", ONERROR_ATTEMPT_RESTART="attempt-restart", ONERROR_MUST_RESTART="must-restart"; + private int time_dl_max=15, time_ul_max=15; + private boolean time_auto=true; + private int count_ping=10; + private String telemetry_extra=""; + private double overheadCompensationFactor=1.06; + private boolean getIP_isp=true; + private String getIP_distance=DISTANCE_KM; + public static final String DISTANCE_NO="no", DISTANCE_MILES="mi", DISTANCE_KM="km"; + private boolean useMebibits=false; + private String test_order="IP_D_U"; + + private void check(){ + if(dl_ckSize<1) throw new IllegalArgumentException("dl_ckSize must be at least 1"); + if(ul_ckSize<1) throw new IllegalArgumentException("ul_ckSize must be at least 1"); + if(dl_parallelStreams<1) throw new IllegalArgumentException("dl_parallelStreams must be at least 1"); + if(ul_parallelStreams<1) throw new IllegalArgumentException("ul_parallelStreams must be at least 1"); + if(dl_streamDelay<0) throw new IllegalArgumentException("dl_streamDelay must be at least 0"); + if(ul_streamDelay<0) throw new IllegalArgumentException("ul_streamDelay must be at least 0"); + if(dl_graceTime<0) throw new IllegalArgumentException("dl_graceTime must be at least 0"); + if(ul_graceTime<0) throw new IllegalArgumentException("ul_graceTime must be at least 0"); + if(!(errorHandlingMode.equals(ONERROR_FAIL)||errorHandlingMode.equals(ONERROR_ATTEMPT_RESTART)||errorHandlingMode.equals(ONERROR_MUST_RESTART))) throw new IllegalArgumentException("errorHandlingMode must be fail, attempt-restart, or must-restart"); + if(time_dl_max<1) throw new IllegalArgumentException("time_dl_max must be at least 1"); + if(time_ul_max<1) throw new IllegalArgumentException("time_ul_max must be at least 1"); + if(count_ping<1) throw new IllegalArgumentException("count_ping must be at least 1"); + if(overheadCompensationFactor<1) throw new IllegalArgumentException("overheadCompensationFactor must be at least 1"); + if(!(getIP_distance.equals(DISTANCE_NO)||getIP_distance.equals(DISTANCE_KM)||getIP_distance.equals(DISTANCE_MILES))) throw new IllegalArgumentException("getIP_distance must be no, km or miles"); + for(char c:test_order.toCharArray()){ + if(!(c=='I'||c=='P'||c=='D'||c=='U'||c=='_')) throw new IllegalArgumentException("test_order can only contain characters I, P, D, U, _"); + } + } + + public SpeedtestConfig(){ + check(); + } + + public SpeedtestConfig(int dl_ckSize, int ul_ckSize, int dl_parallelStreams, int ul_parallelStreams, int dl_streamDelay, int ul_streamDelay, double dl_graceTime, double ul_graceTime, int dl_connectTimeout, int dl_soTimeout, int ul_connectTimeout, int ul_soTimeout, int ping_connectTimeout, int ping_soTimeout, int dl_recvBuffer, int dl_sendBuffer, int ul_recvBuffer, int ul_sendBuffer, int ping_recvBuffer, int ping_sendBuffer, String errorHandlingMode, int time_dl_max, int time_ul_max, boolean time_auto, int count_ping, String telemetry_extra, double overheadCompensationFactor, boolean getIP_isp, String getIP_distance, boolean useMebibits, String test_order) { + this.dl_ckSize = dl_ckSize; + this.ul_ckSize = ul_ckSize; + this.dl_parallelStreams = dl_parallelStreams; + this.ul_parallelStreams = ul_parallelStreams; + this.dl_streamDelay = dl_streamDelay; + this.ul_streamDelay = ul_streamDelay; + this.dl_graceTime = dl_graceTime; + this.ul_graceTime = ul_graceTime; + this.dl_connectTimeout = dl_connectTimeout; + this.dl_soTimeout = dl_soTimeout; + this.ul_connectTimeout = ul_connectTimeout; + this.ul_soTimeout = ul_soTimeout; + this.ping_connectTimeout = ping_connectTimeout; + this.ping_soTimeout = ping_soTimeout; + this.dl_recvBuffer = dl_recvBuffer; + this.dl_sendBuffer = dl_sendBuffer; + this.ul_recvBuffer = ul_recvBuffer; + this.ul_sendBuffer = ul_sendBuffer; + this.ping_recvBuffer = ping_recvBuffer; + this.ping_sendBuffer = ping_sendBuffer; + this.errorHandlingMode = errorHandlingMode; + this.time_dl_max = time_dl_max; + this.time_ul_max = time_ul_max; + this.time_auto = time_auto; + this.count_ping = count_ping; + this.telemetry_extra = telemetry_extra; + this.overheadCompensationFactor = overheadCompensationFactor; + this.getIP_isp = getIP_isp; + this.getIP_distance = getIP_distance; + this.useMebibits = useMebibits; + this.test_order = test_order; + check(); + } + + public SpeedtestConfig(JSONObject json){ + try { + if (json.has("dl_ckSize")) this.dl_ckSize = json.getInt("dl_ckSize"); + if (json.has("ul_ckSize")) this.ul_ckSize = json.getInt("ul_ckSize"); + if (json.has("dl_parallelStreams")) + this.dl_parallelStreams = json.getInt("dl_parallelStreams"); + if (json.has("ul_parallelStreams")) + this.ul_parallelStreams = json.getInt("ul_parallelStreams"); + if (json.has("dl_streamDelay")) this.dl_streamDelay = json.getInt("dl_streamDelay"); + if (json.has("ul_streamDelay")) this.ul_streamDelay = json.getInt("ul_streamDelay"); + if (json.has("dl_graceTime")) this.dl_graceTime = json.getDouble("dl_graceTime"); + if (json.has("ul_graceTime")) this.ul_graceTime = json.getDouble("ul_graceTime"); + if (json.has("dl_connectTimeout")) + this.dl_connectTimeout = json.getInt("dl_connectTimeout"); + if (json.has("ul_connectTimeout")) + this.ul_connectTimeout = json.getInt("ul_connectTimeout"); + if (json.has("ping_connectTimeout")) + this.ping_connectTimeout = json.getInt("ping_connectTimeout"); + if (json.has("dl_soTimeout")) this.dl_soTimeout = json.getInt("dl_soTimeout"); + if (json.has("ul_soTimeout")) this.ul_soTimeout = json.getInt("ul_soTimeout"); + if (json.has("ping_soTimeout")) this.ping_soTimeout = json.getInt("ping_soTimeout"); + if (json.has("dl_recvBuffer")) this.dl_recvBuffer = json.getInt("dl_recvBuffer"); + if (json.has("ul_recvBuffer")) this.ul_recvBuffer = json.getInt("ul_recvBuffer"); + if (json.has("ping_recvBuffer")) this.ping_recvBuffer = json.getInt("ping_recvBuffer"); + if (json.has("dl_sendBuffer")) this.dl_sendBuffer = json.getInt("dl_sendBuffer"); + if (json.has("ul_sendBuffer")) this.ul_sendBuffer = json.getInt("ul_sendBuffer"); + if (json.has("ping_sendBuffer")) this.ping_sendBuffer = json.getInt("ping_sendBuffer"); + if (json.has("errorHandlingMode")) + this.errorHandlingMode = json.getString("errorHandlingMode"); + if (json.has("time_dl_max")) this.time_dl_max = json.getInt("time_dl_max"); + if (json.has("time_ul_max")) this.time_ul_max = json.getInt("time_ul_max"); + if (json.has("count_ping")) this.count_ping = json.getInt("count_ping"); + if (json.has("telemetry_extra")) + this.telemetry_extra = json.getString("telemetry_extra"); + if (json.has("overheadCompensationFactor")) + this.overheadCompensationFactor = json.getDouble("overheadCompensationFactor"); + if (json.has("getIP_isp")) this.getIP_isp = json.getBoolean("getIP_isp"); + if (json.has("getIP_distance")) this.getIP_distance = json.getString("getIP_distance"); + if (json.has("test_order")) this.test_order = json.getString("test_order"); + if (json.has("useMebibits")) this.useMebibits = json.getBoolean("useMebibits"); + check(); + }catch(JSONException t){ + throw new IllegalArgumentException("Invalid JSON ("+t.toString()+")"); + } + } + + public int getDl_ckSize() { + return dl_ckSize; + } + + public int getUl_ckSize() { + return ul_ckSize; + } + + public int getDl_parallelStreams() { + return dl_parallelStreams; + } + + public int getUl_parallelStreams() { + return ul_parallelStreams; + } + + public int getDl_streamDelay() { + return dl_streamDelay; + } + + public int getUl_streamDelay() { + return ul_streamDelay; + } + + public double getDl_graceTime() { + return dl_graceTime; + } + + public double getUl_graceTime() { + return ul_graceTime; + } + + public int getDl_connectTimeout() { + return dl_connectTimeout; + } + + public int getDl_soTimeout() { + return dl_soTimeout; + } + + public int getUl_connectTimeout() { + return ul_connectTimeout; + } + + public int getUl_soTimeout() { + return ul_soTimeout; + } + + public int getPing_connectTimeout() { + return ping_connectTimeout; + } + + public int getPing_soTimeout() { + return ping_soTimeout; + } + + public int getDl_recvBuffer() { + return dl_recvBuffer; + } + + public int getDl_sendBuffer() { + return dl_sendBuffer; + } + + public int getUl_recvBuffer() { + return ul_recvBuffer; + } + + public int getUl_sendBuffer() { + return ul_sendBuffer; + } + + public int getPing_recvBuffer() { + return ping_recvBuffer; + } + + public int getPing_sendBuffer() { + return ping_sendBuffer; + } + + public String getErrorHandlingMode() { + return errorHandlingMode; + } + + public int getTime_dl_max() { + return time_dl_max; + } + + public int getTime_ul_max() { + return time_ul_max; + } + + public boolean getTime_auto() { + return time_auto; + } + + public int getCount_ping() { + return count_ping; + } + + public String getTelemetry_extra() { + return telemetry_extra; + } + + public double getOverheadCompensationFactor() { + return overheadCompensationFactor; + } + + public boolean getGetIP_isp() { + return getIP_isp; + } + + public String getGetIP_distance() { + return getIP_distance; + } + + public boolean getUseMebibits() { + return useMebibits; + } + + public String getTest_order() { + return test_order; + } + + public void setDl_ckSize(int dl_ckSize) { + if(dl_ckSize<1) throw new IllegalArgumentException("dl_ckSize must be at least 1"); + this.dl_ckSize = dl_ckSize; + } + + public void setUl_ckSize(int ul_ckSize) { + if(ul_ckSize<1) throw new IllegalArgumentException("ul_ckSize must be at least 1"); + this.ul_ckSize = ul_ckSize; + } + + public void setDl_parallelStreams(int dl_parallelStreams) { + if(dl_parallelStreams<1) throw new IllegalArgumentException("dl_parallelStreams must be at least 1"); + this.dl_parallelStreams = dl_parallelStreams; + } + + public void setUl_parallelStreams(int ul_parallelStreams) { + if(ul_parallelStreams<1) throw new IllegalArgumentException("ul_parallelStreams must be at least 1"); + this.ul_parallelStreams = ul_parallelStreams; + } + + public void setDl_streamDelay(int dl_streamDelay) { + if(dl_streamDelay<0) throw new IllegalArgumentException("dl_streamDelay must be at least 0"); + this.dl_streamDelay = dl_streamDelay; + } + + public void setUl_streamDelay(int ul_streamDelay) { + if(ul_streamDelay<0) throw new IllegalArgumentException("ul_streamDelay must be at least 0"); + this.ul_streamDelay = ul_streamDelay; + } + + public void setDl_graceTime(double dl_graceTime) { + if(dl_graceTime<0) throw new IllegalArgumentException("dl_graceTime must be at least 0"); + this.dl_graceTime = dl_graceTime; + } + + public void setUl_graceTime(double ul_graceTime) { + if(ul_graceTime<0) throw new IllegalArgumentException("ul_graceTime must be at least 0"); + this.ul_graceTime = ul_graceTime; + } + + public void setDl_connectTimeout(int dl_connectTimeout) { + + this.dl_connectTimeout = dl_connectTimeout; + } + + public void setDl_soTimeout(int dl_soTimeout) { + + this.dl_soTimeout = dl_soTimeout; + } + + public void setUl_connectTimeout(int ul_connectTimeout) { + + this.ul_connectTimeout = ul_connectTimeout; + } + + public void setUl_soTimeout(int ul_soTimeout) { + + this.ul_soTimeout = ul_soTimeout; + } + + public void setPing_connectTimeout(int ping_connectTimeout) { + + this.ping_connectTimeout = ping_connectTimeout; + } + + public void setPing_soTimeout(int ping_soTimeout) { + + this.ping_soTimeout = ping_soTimeout; + } + + public void setDl_recvBuffer(int dl_recvBuffer) { + + this.dl_recvBuffer = dl_recvBuffer; + } + + public void setDl_sendBuffer(int dl_sendBuffer) { + + this.dl_sendBuffer = dl_sendBuffer; + } + + public void setUl_recvBuffer(int ul_recvBuffer) { + + this.ul_recvBuffer = ul_recvBuffer; + } + + public void setUl_sendBuffer(int ul_sendBuffer) { + + this.ul_sendBuffer = ul_sendBuffer; + } + + public void setPing_recvBuffer(int ping_recvBuffer) { + + this.ping_recvBuffer = ping_recvBuffer; + } + + public void setPing_sendBuffer(int ping_sendBuffer) { + + this.ping_sendBuffer = ping_sendBuffer; + } + + public void setErrorHandlingMode(String errorHandlingMode) { + if(!(errorHandlingMode.equals(ONERROR_FAIL)||errorHandlingMode.equals(ONERROR_ATTEMPT_RESTART)||errorHandlingMode.equals(ONERROR_MUST_RESTART))) throw new IllegalArgumentException("errorHandlingMode must be fail, attempt-restart, or must-restart"); + this.errorHandlingMode = errorHandlingMode; + } + + public void setTime_dl_max(int time_dl_max) { + if(time_dl_max<1) throw new IllegalArgumentException("time_dl_max must be at least 1"); + this.time_dl_max = time_dl_max; + } + + public void setTime_ul_max(int time_ul_max) { + if(time_ul_max<1) throw new IllegalArgumentException("time_ul_max must be at least 1"); + this.time_ul_max = time_ul_max; + } + + public void setTime_auto(boolean time_auto) { + + this.time_auto = time_auto; + } + + public void setCount_ping(int count_ping) { + if(count_ping<1) throw new IllegalArgumentException("count_ping must be at least 1"); + this.count_ping = count_ping; + } + + public void setTelemetry_extra(String telemetry_extra) { + + this.telemetry_extra = telemetry_extra; + } + + public void setOverheadCompensationFactor(double overheadCompensationFactor) { + if(overheadCompensationFactor<1) throw new IllegalArgumentException("overheadCompensationFactor must be at least 1"); + this.overheadCompensationFactor = overheadCompensationFactor; + } + + public void setGetIP_isp(boolean getIP_isp) { + + this.getIP_isp = getIP_isp; + } + + public void setGetIP_distance(String getIP_distance) { + if(!(getIP_distance.equals(DISTANCE_NO)||getIP_distance.equals(DISTANCE_KM)||getIP_distance.equals(DISTANCE_MILES))) throw new IllegalArgumentException("getIP_distance must be no, km or miles"); + this.getIP_distance = getIP_distance; + } + + public void setUseMebibits(boolean useMebibits) { + + this.useMebibits = useMebibits; + } + + public void setTest_order(String test_order) { + for(char c:test_order.toCharArray()){ + if(!(c=='I'||c=='P'||c=='D'||c=='U'||c=='_')) throw new IllegalArgumentException("test_order can only contain characters I, P, D, U, _"); + } + this.test_order = test_order; + } + + public SpeedtestConfig clone(){ + return new SpeedtestConfig(dl_ckSize, ul_ckSize, dl_parallelStreams, ul_parallelStreams, dl_streamDelay, ul_streamDelay, dl_graceTime, ul_graceTime, dl_connectTimeout, dl_soTimeout, ul_connectTimeout, ul_soTimeout, ping_connectTimeout, ping_soTimeout, dl_recvBuffer, dl_sendBuffer, ul_recvBuffer, ul_sendBuffer, ping_recvBuffer, ping_sendBuffer, errorHandlingMode, time_dl_max, time_ul_max, time_auto, count_ping, telemetry_extra, overheadCompensationFactor, getIP_isp, getIP_distance, useMebibits, test_order); + } +} diff --git a/src/main/java/com/fdossena/speedtest/core/config/TelemetryConfig.java b/src/main/java/com/fdossena/speedtest/core/config/TelemetryConfig.java new file mode 100644 index 0000000..ffb72fe --- /dev/null +++ b/src/main/java/com/fdossena/speedtest/core/config/TelemetryConfig.java @@ -0,0 +1,55 @@ +package com.fdossena.speedtest.core.config; + +import org.json.JSONException; +import org.json.JSONObject; + +public class TelemetryConfig { + private String telemetryLevel=LEVEL_DISABLED, server=null, path=null, shareURL=null; + public static final String LEVEL_DISABLED="disabled", LEVEL_BASIC="basic", LEVEL_FULL="full"; + + private void check(){ + if(!(telemetryLevel.equals(LEVEL_DISABLED)||telemetryLevel.equals(LEVEL_BASIC)||telemetryLevel.equals(LEVEL_FULL))) throw new IllegalArgumentException("Telemetry level must be disabled, basic or full"); + } + + public TelemetryConfig(){} + + public TelemetryConfig(String telemetryLevel, String server, String path, String shareURL){ + this.telemetryLevel=telemetryLevel; + this.server=server; + this.path=path; + this.shareURL=shareURL; + check(); + } + + public TelemetryConfig(JSONObject json){ + try{ + if(json.has("telemetryLevel")) telemetryLevel=json.getString("telemetryLevel"); + if(json.has("server")) server=json.getString("server"); + if(json.has("path")) path=json.getString("path"); + if(json.has("shareURL")) shareURL=json.getString("shareURL"); + check(); + }catch(JSONException t){ + throw new IllegalArgumentException("Invalid JSON ("+t.toString()+")"); + } + } + + public String getTelemetryLevel() { + return telemetryLevel; + } + + public String getServer() { + return server; + } + + public String getPath() { + return path; + } + + public String getShareURL() { + return shareURL; + } + + public TelemetryConfig clone(){ + return new TelemetryConfig(telemetryLevel,server,path,shareURL); + } +} diff --git a/src/main/java/com/fdossena/speedtest/core/download/DownloadStream.java b/src/main/java/com/fdossena/speedtest/core/download/DownloadStream.java new file mode 100644 index 0000000..b4acee5 --- /dev/null +++ b/src/main/java/com/fdossena/speedtest/core/download/DownloadStream.java @@ -0,0 +1,106 @@ +package com.fdossena.speedtest.core.download; + +import com.fdossena.speedtest.core.config.SpeedtestConfig; +import com.fdossena.speedtest.core.base.Connection; +import com.fdossena.speedtest.core.base.Utils; +import com.fdossena.speedtest.core.log.Logger; + +public abstract class DownloadStream { + private String server, path; + private int ckSize; + private int connectTimeout, soTimeout, recvBuffer, sendBuffer; + private Connection c=null; + private Downloader downloader; + private String errorHandlingMode= SpeedtestConfig.ONERROR_ATTEMPT_RESTART; + private long currentDownloaded=0, previouslyDownloaded=0; + private boolean stopASAP=false; + private Logger log; + + public DownloadStream(String server, String path, int ckSize, String errorHandlingMode, int connectTimeout, int soTimeout, int recvBuffer, int sendBuffer, Logger log){ + this.server=server; + this.path=path; + this.ckSize=ckSize; + this.errorHandlingMode=errorHandlingMode; + this.connectTimeout=connectTimeout; + this.soTimeout=soTimeout; + this.recvBuffer=recvBuffer; + this.sendBuffer=sendBuffer; + this.log=log; + init(); + } + + private void init(){ + if(stopASAP) return; + new Thread(){ + public void run(){ + if(c!=null){ + try{c.close();}catch (Throwable t){} + } + if(downloader !=null) downloader.stopASAP(); + currentDownloaded=0; + try { + c = new Connection(server, connectTimeout, soTimeout, recvBuffer, sendBuffer); + if(stopASAP){ + try{c.close();}catch (Throwable t){} + return; + } + downloader =new Downloader(c,path,ckSize) { + @Override + public void onProgress(long downloaded) { + currentDownloaded=downloaded; + } + + @Override + public void onError(String err) { + log("A downloader died"); + if(errorHandlingMode.equals(SpeedtestConfig.ONERROR_FAIL)){ + DownloadStream.this.onError(err); + return; + } + if(errorHandlingMode.equals(SpeedtestConfig.ONERROR_ATTEMPT_RESTART)||errorHandlingMode.equals(SpeedtestConfig.ONERROR_MUST_RESTART)){ + previouslyDownloaded+=currentDownloaded; + Utils.sleep(100); + init(); + } + } + }; + }catch (Throwable t){ + log("A downloader failed hard"); + try{c.close();}catch (Throwable t1){} + if(errorHandlingMode.equals(SpeedtestConfig.ONERROR_MUST_RESTART)){ + Utils.sleep(100); + init(); + }else onError(t.toString()); + } + } + }.start(); + + } + + public abstract void onError(String err); + + public void stopASAP(){ + stopASAP=true; + if(downloader !=null) downloader.stopASAP(); + } + + public long getTotalDownloaded(){ + return previouslyDownloaded+currentDownloaded; + } + + public void resetDownloadCounter(){ + previouslyDownloaded=0; + currentDownloaded=0; + if(downloader !=null) downloader.resetDownloadCounter(); + } + + public void join(){ + while(downloader==null) Utils.sleep(0,100); + try{downloader.join();}catch (Throwable t){} + } + + private void log(String s){ + if(log!=null) log.l(s); + } + +} diff --git a/src/main/java/com/fdossena/speedtest/core/download/Downloader.java b/src/main/java/com/fdossena/speedtest/core/download/Downloader.java new file mode 100644 index 0000000..a876ac9 --- /dev/null +++ b/src/main/java/com/fdossena/speedtest/core/download/Downloader.java @@ -0,0 +1,73 @@ +package com.fdossena.speedtest.core.download; + +import java.io.InputStream; + +import com.fdossena.speedtest.core.base.Connection; +import com.fdossena.speedtest.core.base.Utils; + +public abstract class Downloader extends Thread{ + private Connection c; + private String path; + private int ckSize; + private boolean stopASAP=false, resetASAP=false; + private long totDownloaded=0; + + public Downloader(Connection c, String path, int ckSize){ + this.c=c; + this.path=path; + this.ckSize=ckSize<1?1:ckSize; + start(); + } + + private static final int BUFFER_SIZE=16384; + public void run(){ + try{ + String s=path; + s+= Utils.url_sep(s)+"ckSize="+ckSize; + long lastProgressEvent=System.currentTimeMillis(); + long ckBytes=ckSize*1048576, newRequestThreshold=ckBytes/4; + long bytesLeft=0; + InputStream in=c.getInputStream(); + byte[] buf=new byte[BUFFER_SIZE]; + for(;;){ + if(stopASAP) break; + if(bytesLeft<=newRequestThreshold){ + c.GET(s, true); + bytesLeft+=ckBytes; + } + if(stopASAP) break; + int l=in.read(buf); + if(stopASAP) break; + bytesLeft-=l; + if(resetASAP){ + totDownloaded=0; + resetASAP=false; + } + totDownloaded+=l; + if(System.currentTimeMillis()-lastProgressEvent>200){ + lastProgressEvent=System.currentTimeMillis(); + onProgress(totDownloaded); + } + } + c.close(); + }catch(Throwable t){ + try{c.close();}catch(Throwable t1){} + onError(t.toString()); + } + } + + public void stopASAP(){ + this.stopASAP=true; + } + + public abstract void onProgress(long downloaded); + public abstract void onError(String err); + + public void resetDownloadCounter(){ + resetASAP=true; + } + + public long getDownloaded() { + return resetASAP?0:totDownloaded; + } +} \ No newline at end of file diff --git a/src/main/java/com/fdossena/speedtest/core/getIP/GetIP.java b/src/main/java/com/fdossena/speedtest/core/getIP/GetIP.java new file mode 100644 index 0000000..51dd07f --- /dev/null +++ b/src/main/java/com/fdossena/speedtest/core/getIP/GetIP.java @@ -0,0 +1,59 @@ +package com.fdossena.speedtest.core.getIP; + +import java.io.BufferedReader; +import java.util.HashMap; + +import com.fdossena.speedtest.core.config.SpeedtestConfig; +import com.fdossena.speedtest.core.base.Connection; +import com.fdossena.speedtest.core.base.Utils; + +public abstract class GetIP extends Thread{ + private Connection c; + private String path; + private boolean isp; + private String distance; + public GetIP(Connection c, String path, boolean isp, String distance){ + this.c=c; + this.path=path; + this.isp=isp; + if(!(distance==null||distance.equals(SpeedtestConfig.DISTANCE_KM)||distance.equals(SpeedtestConfig.DISTANCE_MILES))) throw new IllegalArgumentException("Distance must be null, mi or km"); + this.distance=distance; + start(); + } + + public void run(){ + try{ + String s=path; + if(isp){ + s+= Utils.url_sep(s)+"isp=true"; + if(!distance.equals(SpeedtestConfig.DISTANCE_NO)){ + s+=Utils.url_sep(s)+"distance="+distance; + } + } + c.GET(s,true); + HashMap h=c.parseResponseHeaders(); + BufferedReader br=new BufferedReader(c.getInputStreamReader()); + if(h.get("content-length")!=null){ + //standard encoding + char[] buf=new char[Integer.parseInt(h.get("content-length"))]; + br.read(buf); + String data=new String(buf); + onDataReceived(data); + }else{ + //chunked encoding hack. TODO: improve this garbage with proper chunked support + c.readLineUnbuffered(); //ignore first line + String data=c.readLineUnbuffered(); //actual info we want + c.readLineUnbuffered(); //ignore last line (0) + onDataReceived(data); + } + + c.close(); + }catch(Throwable t){ + try{c.close();}catch(Throwable t1){} + onError(t.toString()); + } + } + + public abstract void onDataReceived(String data); + public abstract void onError(String err); +} diff --git a/src/main/java/com/fdossena/speedtest/core/log/Logger.java b/src/main/java/com/fdossena/speedtest/core/log/Logger.java new file mode 100644 index 0000000..76d27a4 --- /dev/null +++ b/src/main/java/com/fdossena/speedtest/core/log/Logger.java @@ -0,0 +1,18 @@ +package com.fdossena.speedtest.core.log; + +public class Logger { + private String log=""; + public Logger(){} + + public String getLog(){ + synchronized (this){ + return log; + } + } + + public void l(String s){ + synchronized (this){ + log+=System.currentTimeMillis()+" "+s+"\n"; + } + } +} diff --git a/src/main/java/com/fdossena/speedtest/core/ping/PingStream.java b/src/main/java/com/fdossena/speedtest/core/ping/PingStream.java new file mode 100644 index 0000000..e661d6f --- /dev/null +++ b/src/main/java/com/fdossena/speedtest/core/ping/PingStream.java @@ -0,0 +1,99 @@ +package com.fdossena.speedtest.core.ping; + +import com.fdossena.speedtest.core.config.SpeedtestConfig; +import com.fdossena.speedtest.core.base.Connection; +import com.fdossena.speedtest.core.base.Utils; +import com.fdossena.speedtest.core.log.Logger; + +public abstract class PingStream { + private String server, path; + private int remainingPings=10; + private int connectTimeout, soTimeout, recvBuffer, sendBuffer; + private Connection c=null; + private Pinger pinger; + private String errorHandlingMode= SpeedtestConfig.ONERROR_ATTEMPT_RESTART; + private boolean stopASAP=false; + private Logger log; + + public PingStream(String server, String path, int pings, String errorHandlingMode, int connectTimeout, int soTimeout, int recvBuffer, int sendBuffer, Logger log){ + this.server=server; + this.path=path; + remainingPings=pings<1?1:pings; + this.errorHandlingMode=errorHandlingMode; + this.connectTimeout=connectTimeout; + this.soTimeout=soTimeout; + this.recvBuffer=recvBuffer; + this.sendBuffer=sendBuffer; + this.log=log; + init(); + } + + private void init(){ + if(stopASAP) return; + if(c!=null){ + try{c.close();}catch (Throwable t){} + } + new Thread(){ + public void run(){ + if(pinger !=null) pinger.stopASAP(); + if(remainingPings<=0) return; + try { + c = new Connection(server, connectTimeout, soTimeout, recvBuffer, sendBuffer); + if(stopASAP){ + try{c.close();}catch (Throwable t){} + return; + } + pinger =new Pinger(c,path) { + @Override + public boolean onPong(long ns) { + boolean r=PingStream.this.onPong(ns); + if(--remainingPings<=0||!r){ + onDone(); + return false; + } else return true; + } + + @Override + public void onError(String err) { + log("A pinger died"); + if(errorHandlingMode.equals(SpeedtestConfig.ONERROR_FAIL)){ + PingStream.this.onError(err); + return; + } + if(errorHandlingMode.equals(SpeedtestConfig.ONERROR_ATTEMPT_RESTART)||errorHandlingMode.equals(SpeedtestConfig.ONERROR_MUST_RESTART)){ + Utils.sleep(100); + init(); + } + } + }; + }catch (Throwable t){ + log("A pinger failed hard"); + try{c.close();}catch (Throwable t1){} + if(errorHandlingMode.equals(SpeedtestConfig.ONERROR_MUST_RESTART)){ + Utils.sleep(100); + init(); + }else onError(t.toString()); + } + } + }.start(); + } + + public abstract void onError(String err); + public abstract boolean onPong(long ns); + public abstract void onDone(); + + public void stopASAP(){ + stopASAP=true; + if(pinger !=null) pinger.stopASAP(); + } + + public void join(){ + while(pinger==null) Utils.sleep(0,100); + try{pinger.join();}catch (Throwable t){} + } + + private void log(String s){ + if(log!=null) log.l(s); + } + +} diff --git a/src/main/java/com/fdossena/speedtest/core/ping/Pinger.java b/src/main/java/com/fdossena/speedtest/core/ping/Pinger.java new file mode 100644 index 0000000..f896080 --- /dev/null +++ b/src/main/java/com/fdossena/speedtest/core/ping/Pinger.java @@ -0,0 +1,47 @@ +package com.fdossena.speedtest.core.ping; + +import java.io.InputStream; + +import com.fdossena.speedtest.core.base.Connection; + +public abstract class Pinger extends Thread{ + private Connection c; + private String path; + private boolean stopASAP=false; + + public Pinger(Connection c, String path){ + this.c=c; + this.path=path; + start(); + } + + public void run(){ + try{ + String s=path; + InputStream in=c.getInputStream(); + for(;;){ + if(stopASAP) break; + c.GET(s,true); + if(stopASAP) break; + long t=System.nanoTime(); + if(c.readLineUnbuffered().trim().isEmpty()) throw new Exception("Persistent connection died"); + t=System.nanoTime()-t; + if(stopASAP) break; + while(!c.readLineUnbuffered().trim().isEmpty()); + if(stopASAP) break; + if(!onPong(t/2)) break; + } + c.close(); + }catch(Throwable t){ + try{c.close();}catch(Throwable t1){} + onError(t.toString()); + } + } + + public abstract boolean onPong(long ns); + public abstract void onError(String err); + + public void stopASAP(){ + this.stopASAP=true; + } +} \ No newline at end of file diff --git a/src/main/java/com/fdossena/speedtest/core/serverSelector/ServerSelector.java b/src/main/java/com/fdossena/speedtest/core/serverSelector/ServerSelector.java new file mode 100644 index 0000000..ecdded0 --- /dev/null +++ b/src/main/java/com/fdossena/speedtest/core/serverSelector/ServerSelector.java @@ -0,0 +1,115 @@ +package com.fdossena.speedtest.core.serverSelector; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; + +import com.fdossena.speedtest.core.config.SpeedtestConfig; +import com.fdossena.speedtest.core.ping.PingStream; + +public abstract class ServerSelector { + private ArrayList servers=new ArrayList<>(); + private static final int PARALLELISM=6; + private TestPoint selectedTestPoint=null; + private int state=NOT_STARTED; + private static final int NOT_STARTED=0, WORKING=1, DONE=2; + private int timeout; + private static final int PINGS=3, SLOW_THRESHOLD=500; + private boolean stopASAP=false; + + public ServerSelector(TestPoint[] servers, int timeout){ + addTestPoints(servers); + this.timeout=timeout; + } + public void addTestPoint(TestPoint t){ + if(state!=NOT_STARTED) throw new IllegalStateException("Cannot add test points at this time"); + if(t==null) return; + servers.add(t); + } + public void addTestPoint(JSONObject t){ + if(state!=NOT_STARTED) throw new IllegalStateException("Cannot add test points at this time"); + servers.add(new TestPoint(t)); + } + public void addTestPoints(JSONArray a){ + if(state!=NOT_STARTED) throw new IllegalStateException("Cannot add test points at this time"); + for(int i=0;i= servers.size()){ + if(activeStreams<=0){ + selectedTestPoint=null; + for(TestPoint t:servers){ + if(t.ping==-1) continue; + if(selectedTestPoint==null||t.ping h=c.parseResponseHeaders(); + String data=""; + String transferEncoding=h.get("transfer-encoding"); + if(transferEncoding!=null&&transferEncoding.equalsIgnoreCase("chunked")){ + c.readLineUnbuffered(); + } + data=c.readLineUnbuffered(); + onDataReceived(data); + c.close(); + }catch(Throwable t){ + try{c.close();}catch(Throwable t1){} + onError(t.toString()); + } + } + + public abstract void onDataReceived(String data); + public abstract void onError(String err); +} diff --git a/src/main/java/com/fdossena/speedtest/core/upload/UploadStream.java b/src/main/java/com/fdossena/speedtest/core/upload/UploadStream.java new file mode 100644 index 0000000..4ae3c02 --- /dev/null +++ b/src/main/java/com/fdossena/speedtest/core/upload/UploadStream.java @@ -0,0 +1,105 @@ +package com.fdossena.speedtest.core.upload; + +import com.fdossena.speedtest.core.base.Connection; +import com.fdossena.speedtest.core.base.Utils; +import com.fdossena.speedtest.core.config.SpeedtestConfig; +import com.fdossena.speedtest.core.log.Logger; + +public abstract class UploadStream { + private String server, path; + private int ckSize; + private int connectTimeout, soTimeout, recvBuffer, sendBuffer; + private Connection c=null; + private Uploader uploader; + private String errorHandlingMode= SpeedtestConfig.ONERROR_ATTEMPT_RESTART; + private long currentUploaded=0, previouslyUploaded=0; + private boolean stopASAP=false; + private Logger log; + + public UploadStream(String server, String path, int ckSize, String errorHandlingMode, int connectTimeout, int soTimeout, int recvBuffer, int sendBuffer, Logger log){ + this.server=server; + this.path=path; + this.ckSize=ckSize; + this.errorHandlingMode=errorHandlingMode; + this.connectTimeout=connectTimeout; + this.soTimeout=soTimeout; + this.recvBuffer=recvBuffer; + this.sendBuffer=sendBuffer; + this.log=log; + init(); + } + + private void init(){ + if(stopASAP) return; + new Thread(){ + public void run(){ + if(c!=null){ + try{c.close();}catch (Throwable t){} + } + if(uploader !=null) uploader.stopASAP(); + currentUploaded=0; + try { + c = new Connection(server, connectTimeout, soTimeout, recvBuffer, sendBuffer); + if(stopASAP){ + try{c.close();}catch (Throwable t){} + return; + } + uploader =new Uploader(c,path,ckSize) { + @Override + public void onProgress(long uploaded) { + currentUploaded=uploaded; + } + + @Override + public void onError(String err) { + log("An uploader died"); + if(errorHandlingMode.equals(SpeedtestConfig.ONERROR_FAIL)){ + UploadStream.this.onError(err); + return; + } + if(errorHandlingMode.equals(SpeedtestConfig.ONERROR_ATTEMPT_RESTART)||errorHandlingMode.equals(SpeedtestConfig.ONERROR_MUST_RESTART)){ + previouslyUploaded+=currentUploaded; + Utils.sleep(100); + init(); + } + } + }; + }catch (Throwable t){ + log("An uploader failed hard"); + try{c.close();}catch (Throwable t1){} + if(errorHandlingMode.equals(SpeedtestConfig.ONERROR_MUST_RESTART)){ + Utils.sleep(100); + init(); + }else onError(t.toString()); + } + } + }.start(); + } + + public abstract void onError(String err); + + public void stopASAP(){ + stopASAP=true; + if(uploader !=null) uploader.stopASAP(); + } + + public long getTotalUploaded(){ + return previouslyUploaded+currentUploaded; + } + + public void resetUploadCounter(){ + previouslyUploaded=0; + currentUploaded=0; + if(uploader !=null) uploader.resetUploadCounter(); + } + + public void join(){ + while(uploader==null) Utils.sleep(0,100); + try{uploader.join();}catch (Throwable t){} + } + + private void log(String s){ + if(log!=null) log.l(s); + } + +} diff --git a/src/main/java/com/fdossena/speedtest/core/upload/Uploader.java b/src/main/java/com/fdossena/speedtest/core/upload/Uploader.java new file mode 100644 index 0000000..34a0a9f --- /dev/null +++ b/src/main/java/com/fdossena/speedtest/core/upload/Uploader.java @@ -0,0 +1,73 @@ +package com.fdossena.speedtest.core.upload; + +import java.io.OutputStream; +import java.util.Random; + +import com.fdossena.speedtest.core.base.Connection; + +public abstract class Uploader extends Thread{ + private Connection c; + private String path; + private boolean stopASAP=false, resetASAP=false; + private long totUploaded=0; + private byte[] garbage; + + public Uploader(Connection c, String path, int ckSize){ + this.c=c; + this.path=path; + garbage=new byte[ckSize*1048576]; + Random r=new Random(System.nanoTime()); + r.nextBytes(garbage); + start(); + } + + private static final int BUFFER_SIZE=16384; + public void run(){ + try{ + String s=path; + long lastProgressEvent=System.currentTimeMillis(); + OutputStream out=c.getOutputStream(); + byte[] buf=new byte[BUFFER_SIZE]; + for(;;){ + if(stopASAP) break; + c.POST(s,true,"application/octet-stream",garbage.length); + for(int offset=0;offset=garbage.length)?(garbage.length-offset):BUFFER_SIZE; + out.write(garbage,offset,l); + if(stopASAP) break; + if(resetASAP){ + totUploaded=0; + resetASAP=false; + } + totUploaded+=l; + if(System.currentTimeMillis()-lastProgressEvent>200){ + lastProgressEvent=System.currentTimeMillis(); + onProgress(totUploaded); + } + } + if(stopASAP) break; + while(!c.readLineUnbuffered().trim().isEmpty()); + } + c.close(); + }catch(Throwable t){ + try{c.close();}catch(Throwable t1){} + onError(t.toString()); + } + } + + public void stopASAP(){ + this.stopASAP=true; + } + + public abstract void onProgress(long uploaded); + public abstract void onError(String err); + + public void resetUploadCounter(){ + resetASAP=true; + } + + public long getUploaded() { + return resetASAP?0:totUploaded; + } +} diff --git a/src/main/java/com/fdossena/speedtest/core/worker/SpeedtestWorker.java b/src/main/java/com/fdossena/speedtest/core/worker/SpeedtestWorker.java new file mode 100644 index 0000000..d5d3af9 --- /dev/null +++ b/src/main/java/com/fdossena/speedtest/core/worker/SpeedtestWorker.java @@ -0,0 +1,277 @@ +package com.fdossena.speedtest.core.worker; + +import org.json.JSONObject; + +import com.fdossena.speedtest.core.base.Connection; +import com.fdossena.speedtest.core.base.Utils; +import com.fdossena.speedtest.core.config.SpeedtestConfig; +import com.fdossena.speedtest.core.config.TelemetryConfig; +import com.fdossena.speedtest.core.download.DownloadStream; +import com.fdossena.speedtest.core.getIP.GetIP; +import com.fdossena.speedtest.core.log.Logger; +import com.fdossena.speedtest.core.ping.PingStream; +import com.fdossena.speedtest.core.serverSelector.TestPoint; +import com.fdossena.speedtest.core.telemetry.Telemetry; +import com.fdossena.speedtest.core.upload.UploadStream; + +import java.util.Locale; + +public abstract class SpeedtestWorker extends Thread{ + private TestPoint backend; + private SpeedtestConfig config; + private TelemetryConfig telemetryConfig; + private boolean stopASAP=false; + private double dl=-1, ul=-1, ping=-1, jitter=-1; + private String ipIsp=""; + private Logger log=new Logger(); + + public SpeedtestWorker(TestPoint backend, SpeedtestConfig config, TelemetryConfig telemetryConfig){ + this.backend=backend; + this.config=config==null?new SpeedtestConfig():config; + this.telemetryConfig=telemetryConfig==null?new TelemetryConfig():telemetryConfig; + start(); + } + + public void run(){ + log.l("Test started"); + try { + for (char t : config.getTest_order().toCharArray()) { + if(stopASAP) break; + if (t == '_') Utils.sleep(1000); + if (t == 'I') getIP(); + if (t == 'D') dlTest(); + if (t == 'U') ulTest(); + if (t == 'P') pingTest(); + } + }catch (Throwable t){ + onCriticalFailure(t.toString()); + } + try{ + sendTelemetry(); + }catch (Throwable t){} + onEnd(); + } + + private boolean getIPCalled=false; + private void getIP(){ + if(getIPCalled) return; else getIPCalled=true; + final long start=System.currentTimeMillis(); + Connection c = null; + try { + c = new Connection(backend.getServer(), config.getPing_connectTimeout(), config.getPing_soTimeout(), -1, -1); + } catch (Throwable t) { + if (config.getErrorHandlingMode().equals(SpeedtestConfig.ONERROR_FAIL)){ + abort(); + onCriticalFailure(t.toString()); + } + return; + } + GetIP g = new GetIP(c, backend.getGetIpURL(), config.getGetIP_isp(), config.getGetIP_distance()) { + @Override + public void onDataReceived(String data) { + ipIsp=data; + try{ + data=new JSONObject(data).getString("processedString"); + }catch (Throwable t){} + log.l("GetIP: "+ data+ " (took "+(System.currentTimeMillis()-start)+"ms)"); + onIPInfoUpdate(data); + } + + @Override + public void onError(String err) { + log.l("GetIP: FAILED (took "+(System.currentTimeMillis()-start)+"ms)"); + abort(); + onCriticalFailure(err); + } + }; + while (g.isAlive()) Utils.sleep(0, 100); + } + + private boolean dlCalled=false; + private void dlTest(){ + if(dlCalled) return; else dlCalled=true; + final long start=System.currentTimeMillis(); + onDownloadUpdate(0,0); + DownloadStream[] streams=new DownloadStream[config.getDl_parallelStreams()]; + for(int i=0;i=config.getDl_graceTime()*1000){ + graceTimeDone=true; + for(DownloadStream d:streams) d.resetDownloadCounter(); + startT=System.currentTimeMillis(); + continue; + } + if(stopASAP||t+bonusT>=config.getTime_dl_max()*1000){ + for(DownloadStream d:streams) d.stopASAP(); + for(DownloadStream d:streams) d.join(); + break; + } + if(graceTimeDone) { + long totDownloaded = 0; + for (DownloadStream d : streams) totDownloaded += d.getTotalDownloaded(); + double speed = totDownloaded / ((t<100?100:t) / 1000.0); + if (config.getTime_auto()) { + double b = (3.2 * speed) / 100000.0; + bonusT += b > 400 ? 400 : b; + } + double progress = (t + bonusT) / (double) (config.getTime_dl_max() * 1000); + speed = (speed * 8 * config.getOverheadCompensationFactor()) / (config.getUseMebibits() ? 1048576.0 : 1000000.0); + dl = speed; + onDownloadUpdate(dl, progress>1?1:progress); + } + Utils.sleep(100); + } + if(stopASAP) return; + log.l("Download: "+ dl+ " (took "+(System.currentTimeMillis()-start)+"ms)"); + onDownloadUpdate(dl,1); + } + + private boolean ulCalled=false; + private void ulTest(){ + if(ulCalled) return; else ulCalled=true; + final long start=System.currentTimeMillis(); + onUploadUpdate(0,0); + UploadStream[] streams=new UploadStream[config.getUl_parallelStreams()]; + for(int i=0;i=config.getUl_graceTime()*1000){ + graceTimeDone=true; + for(UploadStream u:streams) u.resetUploadCounter(); + startT=System.currentTimeMillis(); + continue; + } + if(stopASAP||t+bonusT>=config.getTime_ul_max()*1000){ + for(UploadStream u:streams) u.stopASAP(); + for(UploadStream u:streams) u.join(); + break; + } + if(graceTimeDone) { + long totUploaded = 0; + for (UploadStream u : streams) totUploaded += u.getTotalUploaded(); + double speed = totUploaded / ((t<100?100:t) / 1000.0); + if (config.getTime_auto()) { + double b = (3.2 * speed) / 100000.0; + bonusT += b > 400 ? 400 : b; + } + double progress = (t + bonusT) / (double) (config.getTime_ul_max() * 1000); + speed = (speed * 8 * config.getOverheadCompensationFactor()) / (config.getUseMebibits() ? 1048576.0 : 1000000.0); + ul = speed; + onUploadUpdate(ul, progress>1?1:progress); + } + Utils.sleep(100); + } + if(stopASAP) return; + log.l("Upload: "+ ul+ " (took "+(System.currentTimeMillis()-start)+"ms)"); + onUploadUpdate(ul,1); + } + + private boolean pingCalled=false; + private void pingTest(){ + if(pingCalled) return; else pingCalled=true; + final long start=System.currentTimeMillis(); + onPingJitterUpdate(0,0,0); + PingStream ps=new PingStream(backend.getServer(),backend.getPingURL(),config.getCount_ping(),config.getErrorHandlingMode(),config.getPing_connectTimeout(),config.getPing_soTimeout(),config.getPing_recvBuffer(),config.getPing_sendBuffer(),log) { + private double minPing=Double.MAX_VALUE, prevPing=-1; + private int counter=0; + @Override + public void onError(String err) { + log.l("Ping: FAILED (took "+(System.currentTimeMillis()-start)+"ms)"); + abort(); + onCriticalFailure(err); + } + + @Override + public boolean onPong(long ns) { + counter++; + double ms = ns / 1000000.0; + if (ms < minPing) minPing = ms; + ping = minPing; + if (prevPing == -1) { + jitter=0; + }else { + double j = Math.abs(ms - prevPing); + jitter=j>jitter?(jitter*0.3+j*0.7):(jitter*0.8+j*0.2); + } + prevPing = ms; + double progress = counter / (double) config.getCount_ping(); + onPingJitterUpdate(ping, jitter, progress>1?1:progress); + return !stopASAP; + } + + @Override + public void onDone() { + } + }; + ps.join(); + if(stopASAP) return; + log.l("Ping: "+ ping+" "+jitter+ " (took "+(System.currentTimeMillis()-start)+"ms)"); + onPingJitterUpdate(ping,jitter,1); + } + + private void sendTelemetry(){ + if(telemetryConfig.getTelemetryLevel().equals(TelemetryConfig.LEVEL_DISABLED)) return; + if(stopASAP&&telemetryConfig.getTelemetryLevel().equals(TelemetryConfig.LEVEL_BASIC)) return; + try{ + Connection c=new Connection(telemetryConfig.getServer(),-1,-1,-1,-1); + Telemetry t=new Telemetry(c,telemetryConfig.getPath(),telemetryConfig.getTelemetryLevel(),ipIsp,config.getTelemetry_extra(),dl==-1?"":String.format(Locale.ENGLISH,"%.2f",dl),ul==-1?"":String.format(Locale.ENGLISH,"%.2f",ul),ping==-1?"":String.format(Locale.ENGLISH,"%.2f",ping),jitter==-1?"":String.format(Locale.ENGLISH,"%.2f",jitter),log.getLog()) { + @Override + public void onDataReceived(String data) { + if(data.startsWith("id")){ + onTestIDReceived(data.split(" ")[1]); + } + } + + @Override + public void onError(String err) { + System.err.println("Telemetry error: "+err); + } + }; + t.join(); + }catch (Throwable t){ + System.err.println("Failed to send telemetry: "+t.toString()); + t.printStackTrace(System.err); + } + } + + public void abort(){ + if(stopASAP) return; + log.l("Manually aborted"); + stopASAP=true; + } + + public abstract void onDownloadUpdate(double dl, double progress); + public abstract void onUploadUpdate(double ul, double progress); + public abstract void onPingJitterUpdate(double ping, double jitter, double progress); + public abstract void onIPInfoUpdate(String ipInfo); + public abstract void onTestIDReceived(String id); + public abstract void onEnd(); + + public abstract void onCriticalFailure(String err); + +} From 2365a80224181482b7ec972df43c7b85c8143885 Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Thu, 16 Jan 2020 16:13:52 +0100 Subject: [PATCH 02/22] Remove android code --- .../com/fdossena/speedtest/core/base/Connection.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/fdossena/speedtest/core/base/Connection.java b/src/main/java/com/fdossena/speedtest/core/base/Connection.java index 132be25..c77811d 100644 --- a/src/main/java/com/fdossena/speedtest/core/base/Connection.java +++ b/src/main/java/com/fdossena/speedtest/core/base/Connection.java @@ -1,7 +1,5 @@ package com.fdossena.speedtest.core.base; -import android.os.Build; - import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; @@ -9,6 +7,7 @@ import java.net.InetSocketAddress; import java.net.Socket; import java.net.URL; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Locale; @@ -21,12 +20,11 @@ public class Connection { private int mode=MODE_NOT_SET; private static final int MODE_NOT_SET=0, MODE_HTTP=1, MODE_HTTPS=2; - private static final String USER_AGENT="Speedtest-Android/1.1.3 (SDK "+Build.VERSION.SDK_INT+"; "+Build.PRODUCT+"; Android "+Build.VERSION.RELEASE+")", - LOCALE= Build.VERSION.SDK_INT>=21?Locale.getDefault().toLanguageTag():null; + private static final String USER_AGENT="LibreSpeed/2.0.0", + LOCALE= Locale.getDefault() != null?Locale.getDefault().toLanguageTag():null; public Connection(String url, int connectTimeout, int soTimeout, int recvBuffer, int sendBuffer){ boolean tryHTTP=false, tryHTTPS=false; - Locale.getDefault().toString(); if(url.startsWith("http://")){ tryHTTP=true; try{ @@ -136,7 +134,7 @@ public PrintStream getPrintStream(){ public InputStreamReader getInputStreamReader(){ if(isr==null){ try{ - isr=new InputStreamReader(getInputStream(),"utf-8"); + isr=new InputStreamReader(getInputStream(), StandardCharsets.UTF_8); }catch(Throwable t){ isr=null; } From 6b10e153e408932f11f1a3fe17da0224e02e187a Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Thu, 16 Jan 2020 16:14:25 +0100 Subject: [PATCH 03/22] Clean build.gradle --- build.gradle | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/build.gradle b/build.gradle index 5760c51..7942378 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * This generated file contains a sample Java Library project to get you started. - * For more details take a look at the Java Libraries chapter in the Gradle - * User Manual available at https://docs.gradle.org/6.1/userguide/java_library_plugin.html - */ - plugins { // Apply the java-library plugin to add support for Java Library id 'java-library' @@ -18,14 +10,7 @@ repositories { } dependencies { - implementation group: 'org.json', name: 'json', version: '20190722' - - // Use JUnit Jupiter API for testing. - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2' - - // Use JUnit Jupiter Engine for testing. - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.2' } test { From 8b7b1e4922e43af64621380f3fd086b219bdb169 Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Thu, 16 Jan 2020 16:42:51 +0100 Subject: [PATCH 04/22] Put classes in the same package to fix visibility This allows to hide most of the implementation as package-private --- .../speedtest/core/{base => }/Connection.java | 32 +++++----- .../core/{download => }/DownloadStream.java | 23 ++++---- .../core/{download => }/Downloader.java | 20 +++---- .../speedtest/core/{getIP => }/GetIP.java | 14 ++--- .../speedtest/core/{log => }/Logger.java | 10 ++-- .../speedtest/core/{ping => }/PingStream.java | 23 ++++---- .../speedtest/core/{ping => }/Pinger.java | 14 ++--- .../{serverSelector => }/ServerSelector.java | 33 +++++------ .../fdossena/speedtest/core/Speedtest.java | 5 +- .../core/{worker => }/SpeedtestWorker.java | 58 +++++++++---------- .../core/{telemetry => }/Telemetry.java | 14 ++--- .../core/{serverSelector => }/TestPoint.java | 2 +- .../core/{upload => }/UploadStream.java | 23 ++++---- .../speedtest/core/{upload => }/Uploader.java | 18 +++--- .../speedtest/core/{base => }/Utils.java | 12 ++-- 15 files changed, 144 insertions(+), 157 deletions(-) rename src/main/java/com/fdossena/speedtest/core/{base => }/Connection.java (89%) rename src/main/java/com/fdossena/speedtest/core/{download => }/DownloadStream.java (81%) rename src/main/java/com/fdossena/speedtest/core/{download => }/Downloader.java (78%) rename src/main/java/com/fdossena/speedtest/core/{getIP => }/GetIP.java (83%) rename src/main/java/com/fdossena/speedtest/core/{log => }/Logger.java (58%) rename src/main/java/com/fdossena/speedtest/core/{ping => }/PingStream.java (81%) rename src/main/java/com/fdossena/speedtest/core/{ping => }/Pinger.java (76%) rename src/main/java/com/fdossena/speedtest/core/{serverSelector => }/ServerSelector.java (81%) rename src/main/java/com/fdossena/speedtest/core/{worker => }/SpeedtestWorker.java (86%) rename src/main/java/com/fdossena/speedtest/core/{telemetry => }/Telemetry.java (82%) rename src/main/java/com/fdossena/speedtest/core/{serverSelector => }/TestPoint.java (97%) rename src/main/java/com/fdossena/speedtest/core/{upload => }/UploadStream.java (81%) rename src/main/java/com/fdossena/speedtest/core/{upload => }/Uploader.java (82%) rename src/main/java/com/fdossena/speedtest/core/{base => }/Utils.java (55%) diff --git a/src/main/java/com/fdossena/speedtest/core/base/Connection.java b/src/main/java/com/fdossena/speedtest/core/Connection.java similarity index 89% rename from src/main/java/com/fdossena/speedtest/core/base/Connection.java rename to src/main/java/com/fdossena/speedtest/core/Connection.java index c77811d..89f6b6c 100644 --- a/src/main/java/com/fdossena/speedtest/core/base/Connection.java +++ b/src/main/java/com/fdossena/speedtest/core/Connection.java @@ -1,4 +1,4 @@ -package com.fdossena.speedtest.core.base; +package com.fdossena.speedtest.core; import java.io.InputStream; import java.io.InputStreamReader; @@ -14,7 +14,7 @@ import javax.net.SocketFactory; import javax.net.ssl.SSLSocketFactory; -public class Connection { +class Connection { private Socket socket; private String host; private int port; private int mode=MODE_NOT_SET; @@ -23,7 +23,7 @@ public class Connection { private static final String USER_AGENT="LibreSpeed/2.0.0", LOCALE= Locale.getDefault() != null?Locale.getDefault().toLanguageTag():null; - public Connection(String url, int connectTimeout, int soTimeout, int recvBuffer, int sendBuffer){ + Connection(String url, int connectTimeout, int soTimeout, int recvBuffer, int sendBuffer){ boolean tryHTTP=false, tryHTTPS=false; if(url.startsWith("http://")){ tryHTTP=true; @@ -99,11 +99,11 @@ public Connection(String url, int connectTimeout, int soTimeout, int recvBuffer, } private static final int DEFAULT_CONNECT_TIMEOUT=2000, DEFAULT_SO_TIMEOUT=5000; - public Connection(String url){ + Connection(String url){ this(url,DEFAULT_CONNECT_TIMEOUT,DEFAULT_SO_TIMEOUT,-1,-1); } - public InputStream getInputStream(){ + InputStream getInputStream(){ try{ return socket.getInputStream(); }catch (Throwable t){ @@ -111,7 +111,7 @@ public InputStream getInputStream(){ } } - public OutputStream getOutputStream(){ + OutputStream getOutputStream(){ try{ return socket.getOutputStream(); }catch (Throwable t){ @@ -120,7 +120,7 @@ public OutputStream getOutputStream(){ } private PrintStream ps=null; - public PrintStream getPrintStream(){ + PrintStream getPrintStream(){ if(ps==null){ try{ ps=new PrintStream(getOutputStream(),false,"utf-8"); @@ -131,7 +131,7 @@ public PrintStream getPrintStream(){ return ps; } private InputStreamReader isr=null; - public InputStreamReader getInputStreamReader(){ + InputStreamReader getInputStreamReader(){ if(isr==null){ try{ isr=new InputStreamReader(getInputStream(), StandardCharsets.UTF_8); @@ -142,7 +142,7 @@ public InputStreamReader getInputStreamReader(){ return isr; } - public void GET(String path, boolean keepAlive) throws Exception{ + void GET(String path, boolean keepAlive) throws Exception{ try{ if(!path.startsWith("/")) path="/"+path; PrintStream ps=getPrintStream(); @@ -159,7 +159,7 @@ public void GET(String path, boolean keepAlive) throws Exception{ } } - public void POST(String path, boolean keepAlive, String contentType, long contentLength) throws Exception{ + void POST(String path, boolean keepAlive, String contentType, long contentLength) throws Exception{ try{ if(!path.startsWith("/")) path="/"+path; PrintStream ps=getPrintStream(); @@ -179,7 +179,7 @@ public void POST(String path, boolean keepAlive, String contentType, long conten } } - public String readLineUnbuffered(){ + String readLineUnbuffered(){ try { InputStreamReader in = getInputStreamReader(); StringBuilder sb=new StringBuilder(); @@ -195,7 +195,7 @@ public String readLineUnbuffered(){ } } - public HashMap parseResponseHeaders() throws Exception{ + HashMap parseResponseHeaders() throws Exception{ try{ HashMap ret=new HashMap<>(); String s=readLineUnbuffered(); @@ -213,22 +213,22 @@ public HashMap parseResponseHeaders() throws Exception{ } } - public void close(){ + void close(){ try{ socket.close(); }catch(Throwable t){} socket=null; } - public String getHost() { + String getHost() { return host; } - public int getPort() { + int getPort() { return port; } - public int getMode() { + int getMode() { return mode; } diff --git a/src/main/java/com/fdossena/speedtest/core/download/DownloadStream.java b/src/main/java/com/fdossena/speedtest/core/DownloadStream.java similarity index 81% rename from src/main/java/com/fdossena/speedtest/core/download/DownloadStream.java rename to src/main/java/com/fdossena/speedtest/core/DownloadStream.java index b4acee5..6b5cda0 100644 --- a/src/main/java/com/fdossena/speedtest/core/download/DownloadStream.java +++ b/src/main/java/com/fdossena/speedtest/core/DownloadStream.java @@ -1,11 +1,8 @@ -package com.fdossena.speedtest.core.download; +package com.fdossena.speedtest.core; import com.fdossena.speedtest.core.config.SpeedtestConfig; -import com.fdossena.speedtest.core.base.Connection; -import com.fdossena.speedtest.core.base.Utils; -import com.fdossena.speedtest.core.log.Logger; -public abstract class DownloadStream { +abstract class DownloadStream { private String server, path; private int ckSize; private int connectTimeout, soTimeout, recvBuffer, sendBuffer; @@ -16,7 +13,7 @@ public abstract class DownloadStream { private boolean stopASAP=false; private Logger log; - public DownloadStream(String server, String path, int ckSize, String errorHandlingMode, int connectTimeout, int soTimeout, int recvBuffer, int sendBuffer, Logger log){ + DownloadStream(String server, String path, int ckSize, String errorHandlingMode, int connectTimeout, int soTimeout, int recvBuffer, int sendBuffer, Logger log){ this.server=server; this.path=path; this.ckSize=ckSize; @@ -46,12 +43,12 @@ public void run(){ } downloader =new Downloader(c,path,ckSize) { @Override - public void onProgress(long downloaded) { + void onProgress(long downloaded) { currentDownloaded=downloaded; } @Override - public void onError(String err) { + void onError(String err) { log("A downloader died"); if(errorHandlingMode.equals(SpeedtestConfig.ONERROR_FAIL)){ DownloadStream.this.onError(err); @@ -77,24 +74,24 @@ public void onError(String err) { } - public abstract void onError(String err); + abstract void onError(String err); - public void stopASAP(){ + void stopASAP(){ stopASAP=true; if(downloader !=null) downloader.stopASAP(); } - public long getTotalDownloaded(){ + long getTotalDownloaded(){ return previouslyDownloaded+currentDownloaded; } - public void resetDownloadCounter(){ + void resetDownloadCounter(){ previouslyDownloaded=0; currentDownloaded=0; if(downloader !=null) downloader.resetDownloadCounter(); } - public void join(){ + void join(){ while(downloader==null) Utils.sleep(0,100); try{downloader.join();}catch (Throwable t){} } diff --git a/src/main/java/com/fdossena/speedtest/core/download/Downloader.java b/src/main/java/com/fdossena/speedtest/core/Downloader.java similarity index 78% rename from src/main/java/com/fdossena/speedtest/core/download/Downloader.java rename to src/main/java/com/fdossena/speedtest/core/Downloader.java index a876ac9..88e2ac3 100644 --- a/src/main/java/com/fdossena/speedtest/core/download/Downloader.java +++ b/src/main/java/com/fdossena/speedtest/core/Downloader.java @@ -1,18 +1,18 @@ -package com.fdossena.speedtest.core.download; +package com.fdossena.speedtest.core; import java.io.InputStream; -import com.fdossena.speedtest.core.base.Connection; -import com.fdossena.speedtest.core.base.Utils; +import com.fdossena.speedtest.core.Connection; +import com.fdossena.speedtest.core.Utils; -public abstract class Downloader extends Thread{ +abstract class Downloader extends Thread{ private Connection c; private String path; private int ckSize; private boolean stopASAP=false, resetASAP=false; private long totDownloaded=0; - public Downloader(Connection c, String path, int ckSize){ + Downloader(Connection c, String path, int ckSize){ this.c=c; this.path=path; this.ckSize=ckSize<1?1:ckSize; @@ -56,18 +56,18 @@ public void run(){ } } - public void stopASAP(){ + void stopASAP(){ this.stopASAP=true; } - public abstract void onProgress(long downloaded); - public abstract void onError(String err); + abstract void onProgress(long downloaded); + abstract void onError(String err); - public void resetDownloadCounter(){ + void resetDownloadCounter(){ resetASAP=true; } - public long getDownloaded() { + long getDownloaded() { return resetASAP?0:totDownloaded; } } \ No newline at end of file diff --git a/src/main/java/com/fdossena/speedtest/core/getIP/GetIP.java b/src/main/java/com/fdossena/speedtest/core/GetIP.java similarity index 83% rename from src/main/java/com/fdossena/speedtest/core/getIP/GetIP.java rename to src/main/java/com/fdossena/speedtest/core/GetIP.java index 51dd07f..0a08a1a 100644 --- a/src/main/java/com/fdossena/speedtest/core/getIP/GetIP.java +++ b/src/main/java/com/fdossena/speedtest/core/GetIP.java @@ -1,18 +1,18 @@ -package com.fdossena.speedtest.core.getIP; +package com.fdossena.speedtest.core; import java.io.BufferedReader; import java.util.HashMap; import com.fdossena.speedtest.core.config.SpeedtestConfig; -import com.fdossena.speedtest.core.base.Connection; -import com.fdossena.speedtest.core.base.Utils; +import com.fdossena.speedtest.core.Connection; +import com.fdossena.speedtest.core.Utils; -public abstract class GetIP extends Thread{ +abstract class GetIP extends Thread{ private Connection c; private String path; private boolean isp; private String distance; - public GetIP(Connection c, String path, boolean isp, String distance){ + GetIP(Connection c, String path, boolean isp, String distance){ this.c=c; this.path=path; this.isp=isp; @@ -54,6 +54,6 @@ public void run(){ } } - public abstract void onDataReceived(String data); - public abstract void onError(String err); + abstract void onDataReceived(String data); + abstract void onError(String err); } diff --git a/src/main/java/com/fdossena/speedtest/core/log/Logger.java b/src/main/java/com/fdossena/speedtest/core/Logger.java similarity index 58% rename from src/main/java/com/fdossena/speedtest/core/log/Logger.java rename to src/main/java/com/fdossena/speedtest/core/Logger.java index 76d27a4..b051d39 100644 --- a/src/main/java/com/fdossena/speedtest/core/log/Logger.java +++ b/src/main/java/com/fdossena/speedtest/core/Logger.java @@ -1,16 +1,16 @@ -package com.fdossena.speedtest.core.log; +package com.fdossena.speedtest.core; -public class Logger { +class Logger { private String log=""; - public Logger(){} + Logger(){} - public String getLog(){ + String getLog(){ synchronized (this){ return log; } } - public void l(String s){ + void l(String s){ synchronized (this){ log+=System.currentTimeMillis()+" "+s+"\n"; } diff --git a/src/main/java/com/fdossena/speedtest/core/ping/PingStream.java b/src/main/java/com/fdossena/speedtest/core/PingStream.java similarity index 81% rename from src/main/java/com/fdossena/speedtest/core/ping/PingStream.java rename to src/main/java/com/fdossena/speedtest/core/PingStream.java index e661d6f..9b102aa 100644 --- a/src/main/java/com/fdossena/speedtest/core/ping/PingStream.java +++ b/src/main/java/com/fdossena/speedtest/core/PingStream.java @@ -1,11 +1,8 @@ -package com.fdossena.speedtest.core.ping; +package com.fdossena.speedtest.core; import com.fdossena.speedtest.core.config.SpeedtestConfig; -import com.fdossena.speedtest.core.base.Connection; -import com.fdossena.speedtest.core.base.Utils; -import com.fdossena.speedtest.core.log.Logger; -public abstract class PingStream { +abstract class PingStream { private String server, path; private int remainingPings=10; private int connectTimeout, soTimeout, recvBuffer, sendBuffer; @@ -15,7 +12,7 @@ public abstract class PingStream { private boolean stopASAP=false; private Logger log; - public PingStream(String server, String path, int pings, String errorHandlingMode, int connectTimeout, int soTimeout, int recvBuffer, int sendBuffer, Logger log){ + PingStream(String server, String path, int pings, String errorHandlingMode, int connectTimeout, int soTimeout, int recvBuffer, int sendBuffer, Logger log){ this.server=server; this.path=path; remainingPings=pings<1?1:pings; @@ -45,7 +42,7 @@ public void run(){ } pinger =new Pinger(c,path) { @Override - public boolean onPong(long ns) { + boolean onPong(long ns) { boolean r=PingStream.this.onPong(ns); if(--remainingPings<=0||!r){ onDone(); @@ -54,7 +51,7 @@ public boolean onPong(long ns) { } @Override - public void onError(String err) { + void onError(String err) { log("A pinger died"); if(errorHandlingMode.equals(SpeedtestConfig.ONERROR_FAIL)){ PingStream.this.onError(err); @@ -78,16 +75,16 @@ public void onError(String err) { }.start(); } - public abstract void onError(String err); - public abstract boolean onPong(long ns); - public abstract void onDone(); + abstract void onError(String err); + abstract boolean onPong(long ns); + abstract void onDone(); - public void stopASAP(){ + void stopASAP(){ stopASAP=true; if(pinger !=null) pinger.stopASAP(); } - public void join(){ + void join(){ while(pinger==null) Utils.sleep(0,100); try{pinger.join();}catch (Throwable t){} } diff --git a/src/main/java/com/fdossena/speedtest/core/ping/Pinger.java b/src/main/java/com/fdossena/speedtest/core/Pinger.java similarity index 76% rename from src/main/java/com/fdossena/speedtest/core/ping/Pinger.java rename to src/main/java/com/fdossena/speedtest/core/Pinger.java index f896080..bee6c78 100644 --- a/src/main/java/com/fdossena/speedtest/core/ping/Pinger.java +++ b/src/main/java/com/fdossena/speedtest/core/Pinger.java @@ -1,15 +1,15 @@ -package com.fdossena.speedtest.core.ping; +package com.fdossena.speedtest.core; import java.io.InputStream; -import com.fdossena.speedtest.core.base.Connection; +import com.fdossena.speedtest.core.Connection; -public abstract class Pinger extends Thread{ +abstract class Pinger extends Thread{ private Connection c; private String path; private boolean stopASAP=false; - public Pinger(Connection c, String path){ + Pinger(Connection c, String path){ this.c=c; this.path=path; start(); @@ -38,10 +38,10 @@ public void run(){ } } - public abstract boolean onPong(long ns); - public abstract void onError(String err); + abstract boolean onPong(long ns); + abstract void onError(String err); - public void stopASAP(){ + void stopASAP(){ this.stopASAP=true; } } \ No newline at end of file diff --git a/src/main/java/com/fdossena/speedtest/core/serverSelector/ServerSelector.java b/src/main/java/com/fdossena/speedtest/core/ServerSelector.java similarity index 81% rename from src/main/java/com/fdossena/speedtest/core/serverSelector/ServerSelector.java rename to src/main/java/com/fdossena/speedtest/core/ServerSelector.java index ecdded0..491eb68 100644 --- a/src/main/java/com/fdossena/speedtest/core/serverSelector/ServerSelector.java +++ b/src/main/java/com/fdossena/speedtest/core/ServerSelector.java @@ -1,4 +1,4 @@ -package com.fdossena.speedtest.core.serverSelector; +package com.fdossena.speedtest.core; import org.json.JSONArray; import org.json.JSONException; @@ -7,9 +7,8 @@ import java.util.ArrayList; import com.fdossena.speedtest.core.config.SpeedtestConfig; -import com.fdossena.speedtest.core.ping.PingStream; -public abstract class ServerSelector { +abstract class ServerSelector { private ArrayList servers=new ArrayList<>(); private static final int PARALLELISM=6; private TestPoint selectedTestPoint=null; @@ -19,20 +18,20 @@ public abstract class ServerSelector { private static final int PINGS=3, SLOW_THRESHOLD=500; private boolean stopASAP=false; - public ServerSelector(TestPoint[] servers, int timeout){ + ServerSelector(TestPoint[] servers, int timeout){ addTestPoints(servers); this.timeout=timeout; } - public void addTestPoint(TestPoint t){ + void addTestPoint(TestPoint t){ if(state!=NOT_STARTED) throw new IllegalStateException("Cannot add test points at this time"); if(t==null) return; servers.add(t); } - public void addTestPoint(JSONObject t){ + void addTestPoint(JSONObject t){ if(state!=NOT_STARTED) throw new IllegalStateException("Cannot add test points at this time"); servers.add(new TestPoint(t)); } - public void addTestPoints(JSONArray a){ + void addTestPoints(JSONArray a){ if(state!=NOT_STARTED) throw new IllegalStateException("Cannot add test points at this time"); for(int i=0;i servers=new ArrayList<>(); @@ -19,7 +16,7 @@ public class Speedtest { private TelemetryConfig telemetryConfig=new TelemetryConfig(); private int state=0; //0=configs, 1=test points, 2=server selection, 3=ready, 4=testing, 5=finished - private Object mutex=new Object(); + private final Object mutex=new Object(); private String originalExtra=""; diff --git a/src/main/java/com/fdossena/speedtest/core/worker/SpeedtestWorker.java b/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java similarity index 86% rename from src/main/java/com/fdossena/speedtest/core/worker/SpeedtestWorker.java rename to src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java index d5d3af9..b4a4465 100644 --- a/src/main/java/com/fdossena/speedtest/core/worker/SpeedtestWorker.java +++ b/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java @@ -1,22 +1,22 @@ -package com.fdossena.speedtest.core.worker; +package com.fdossena.speedtest.core; import org.json.JSONObject; -import com.fdossena.speedtest.core.base.Connection; -import com.fdossena.speedtest.core.base.Utils; +import com.fdossena.speedtest.core.Connection; +import com.fdossena.speedtest.core.Utils; import com.fdossena.speedtest.core.config.SpeedtestConfig; import com.fdossena.speedtest.core.config.TelemetryConfig; -import com.fdossena.speedtest.core.download.DownloadStream; -import com.fdossena.speedtest.core.getIP.GetIP; -import com.fdossena.speedtest.core.log.Logger; -import com.fdossena.speedtest.core.ping.PingStream; -import com.fdossena.speedtest.core.serverSelector.TestPoint; -import com.fdossena.speedtest.core.telemetry.Telemetry; -import com.fdossena.speedtest.core.upload.UploadStream; +import com.fdossena.speedtest.core.DownloadStream; +import com.fdossena.speedtest.core.GetIP; +import com.fdossena.speedtest.core.Logger; +import com.fdossena.speedtest.core.PingStream; +import com.fdossena.speedtest.core.TestPoint; +import com.fdossena.speedtest.core.Telemetry; +import com.fdossena.speedtest.core.UploadStream; import java.util.Locale; -public abstract class SpeedtestWorker extends Thread{ +abstract class SpeedtestWorker extends Thread{ private TestPoint backend; private SpeedtestConfig config; private TelemetryConfig telemetryConfig; @@ -25,7 +25,7 @@ public abstract class SpeedtestWorker extends Thread{ private String ipIsp=""; private Logger log=new Logger(); - public SpeedtestWorker(TestPoint backend, SpeedtestConfig config, TelemetryConfig telemetryConfig){ + SpeedtestWorker(TestPoint backend, SpeedtestConfig config, TelemetryConfig telemetryConfig){ this.backend=backend; this.config=config==null?new SpeedtestConfig():config; this.telemetryConfig=telemetryConfig==null?new TelemetryConfig():telemetryConfig; @@ -68,7 +68,7 @@ private void getIP(){ } GetIP g = new GetIP(c, backend.getGetIpURL(), config.getGetIP_isp(), config.getGetIP_distance()) { @Override - public void onDataReceived(String data) { + void onDataReceived(String data) { ipIsp=data; try{ data=new JSONObject(data).getString("processedString"); @@ -78,7 +78,7 @@ public void onDataReceived(String data) { } @Override - public void onError(String err) { + void onError(String err) { log.l("GetIP: FAILED (took "+(System.currentTimeMillis()-start)+"ms)"); abort(); onCriticalFailure(err); @@ -96,7 +96,7 @@ private void dlTest(){ for(int i=0;i Date: Fri, 17 Jan 2020 09:53:01 +0100 Subject: [PATCH 05/22] Add license --- LICENSE | 165 ++++++++++++++++++ build.gradle | 17 ++ gradle/wrapper/gradle-wrapper.properties | 17 ++ settings.gradle | 17 ++ .../fdossena/speedtest/core/Connection.java | 17 ++ .../speedtest/core/DownloadStream.java | 17 ++ .../fdossena/speedtest/core/Downloader.java | 17 ++ .../com/fdossena/speedtest/core/GetIP.java | 17 ++ .../com/fdossena/speedtest/core/Logger.java | 17 ++ .../fdossena/speedtest/core/PingStream.java | 17 ++ .../com/fdossena/speedtest/core/Pinger.java | 17 ++ .../speedtest/core/ServerSelector.java | 17 ++ .../fdossena/speedtest/core/Speedtest.java | 17 ++ .../speedtest/core/SpeedtestWorker.java | 17 ++ .../fdossena/speedtest/core/Telemetry.java | 17 ++ .../fdossena/speedtest/core/TestPoint.java | 17 ++ .../fdossena/speedtest/core/UploadStream.java | 17 ++ .../com/fdossena/speedtest/core/Uploader.java | 17 ++ .../com/fdossena/speedtest/core/Utils.java | 17 ++ .../core/config/SpeedtestConfig.java | 17 ++ .../core/config/TelemetryConfig.java | 17 ++ 21 files changed, 505 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0a04128 --- /dev/null +++ b/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/build.gradle b/build.gradle index 7942378..8c41634 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + plugins { // Apply the java-library plugin to add support for Java Library id 'java-library' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f149949..947e5ed 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,3 +1,20 @@ +# +# This file is part of the LibreSpeed speedtest library. +# +# The LibreSpeed speedtest library is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Foobar is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with Foobar. If not, see . +# + #Thu Jan 16 16:00:12 CET 2020 distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip distributionBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index dbbcbf6..7daea48 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + /* * This file was generated by the Gradle 'init' task. * diff --git a/src/main/java/com/fdossena/speedtest/core/Connection.java b/src/main/java/com/fdossena/speedtest/core/Connection.java index 89f6b6c..5ef0e82 100644 --- a/src/main/java/com/fdossena/speedtest/core/Connection.java +++ b/src/main/java/com/fdossena/speedtest/core/Connection.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core; import java.io.InputStream; diff --git a/src/main/java/com/fdossena/speedtest/core/DownloadStream.java b/src/main/java/com/fdossena/speedtest/core/DownloadStream.java index 6b5cda0..6447cdd 100644 --- a/src/main/java/com/fdossena/speedtest/core/DownloadStream.java +++ b/src/main/java/com/fdossena/speedtest/core/DownloadStream.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core; import com.fdossena.speedtest.core.config.SpeedtestConfig; diff --git a/src/main/java/com/fdossena/speedtest/core/Downloader.java b/src/main/java/com/fdossena/speedtest/core/Downloader.java index 88e2ac3..9d3065e 100644 --- a/src/main/java/com/fdossena/speedtest/core/Downloader.java +++ b/src/main/java/com/fdossena/speedtest/core/Downloader.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core; import java.io.InputStream; diff --git a/src/main/java/com/fdossena/speedtest/core/GetIP.java b/src/main/java/com/fdossena/speedtest/core/GetIP.java index 0a08a1a..7888134 100644 --- a/src/main/java/com/fdossena/speedtest/core/GetIP.java +++ b/src/main/java/com/fdossena/speedtest/core/GetIP.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core; import java.io.BufferedReader; diff --git a/src/main/java/com/fdossena/speedtest/core/Logger.java b/src/main/java/com/fdossena/speedtest/core/Logger.java index b051d39..1729962 100644 --- a/src/main/java/com/fdossena/speedtest/core/Logger.java +++ b/src/main/java/com/fdossena/speedtest/core/Logger.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core; class Logger { diff --git a/src/main/java/com/fdossena/speedtest/core/PingStream.java b/src/main/java/com/fdossena/speedtest/core/PingStream.java index 9b102aa..ff9a259 100644 --- a/src/main/java/com/fdossena/speedtest/core/PingStream.java +++ b/src/main/java/com/fdossena/speedtest/core/PingStream.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core; import com.fdossena.speedtest.core.config.SpeedtestConfig; diff --git a/src/main/java/com/fdossena/speedtest/core/Pinger.java b/src/main/java/com/fdossena/speedtest/core/Pinger.java index bee6c78..89924bc 100644 --- a/src/main/java/com/fdossena/speedtest/core/Pinger.java +++ b/src/main/java/com/fdossena/speedtest/core/Pinger.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core; import java.io.InputStream; diff --git a/src/main/java/com/fdossena/speedtest/core/ServerSelector.java b/src/main/java/com/fdossena/speedtest/core/ServerSelector.java index 491eb68..e23c7ca 100644 --- a/src/main/java/com/fdossena/speedtest/core/ServerSelector.java +++ b/src/main/java/com/fdossena/speedtest/core/ServerSelector.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core; import org.json.JSONArray; diff --git a/src/main/java/com/fdossena/speedtest/core/Speedtest.java b/src/main/java/com/fdossena/speedtest/core/Speedtest.java index f649b92..64e54a4 100644 --- a/src/main/java/com/fdossena/speedtest/core/Speedtest.java +++ b/src/main/java/com/fdossena/speedtest/core/Speedtest.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core; import org.json.JSONArray; diff --git a/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java b/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java index b4a4465..548786c 100644 --- a/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java +++ b/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core; import org.json.JSONObject; diff --git a/src/main/java/com/fdossena/speedtest/core/Telemetry.java b/src/main/java/com/fdossena/speedtest/core/Telemetry.java index 8631ab9..e02a58e 100644 --- a/src/main/java/com/fdossena/speedtest/core/Telemetry.java +++ b/src/main/java/com/fdossena/speedtest/core/Telemetry.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core; import java.io.PrintStream; diff --git a/src/main/java/com/fdossena/speedtest/core/TestPoint.java b/src/main/java/com/fdossena/speedtest/core/TestPoint.java index 24ff9db..325a523 100644 --- a/src/main/java/com/fdossena/speedtest/core/TestPoint.java +++ b/src/main/java/com/fdossena/speedtest/core/TestPoint.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core; import org.json.JSONException; diff --git a/src/main/java/com/fdossena/speedtest/core/UploadStream.java b/src/main/java/com/fdossena/speedtest/core/UploadStream.java index 6e475ed..c65834a 100644 --- a/src/main/java/com/fdossena/speedtest/core/UploadStream.java +++ b/src/main/java/com/fdossena/speedtest/core/UploadStream.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core; import com.fdossena.speedtest.core.config.SpeedtestConfig; diff --git a/src/main/java/com/fdossena/speedtest/core/Uploader.java b/src/main/java/com/fdossena/speedtest/core/Uploader.java index 5fb5803..770b7c3 100644 --- a/src/main/java/com/fdossena/speedtest/core/Uploader.java +++ b/src/main/java/com/fdossena/speedtest/core/Uploader.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core; import java.io.OutputStream; diff --git a/src/main/java/com/fdossena/speedtest/core/Utils.java b/src/main/java/com/fdossena/speedtest/core/Utils.java index c6439ae..76739dd 100644 --- a/src/main/java/com/fdossena/speedtest/core/Utils.java +++ b/src/main/java/com/fdossena/speedtest/core/Utils.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core; import java.net.URLEncoder; diff --git a/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java b/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java index c7d7584..380e89e 100644 --- a/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java +++ b/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core.config; import org.json.JSONException; diff --git a/src/main/java/com/fdossena/speedtest/core/config/TelemetryConfig.java b/src/main/java/com/fdossena/speedtest/core/config/TelemetryConfig.java index ffb72fe..42631a2 100644 --- a/src/main/java/com/fdossena/speedtest/core/config/TelemetryConfig.java +++ b/src/main/java/com/fdossena/speedtest/core/config/TelemetryConfig.java @@ -1,3 +1,20 @@ +/* + * This file is part of the LibreSpeed speedtest library. + * + * The LibreSpeed speedtest library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Foobar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Foobar. If not, see . + */ + package com.fdossena.speedtest.core.config; import org.json.JSONException; From 34be25587741d8f94077dc40d1a040758ed85999 Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Fri, 31 Jan 2020 07:57:50 +0100 Subject: [PATCH 06/22] Add basic README --- README.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..deece1a --- /dev/null +++ b/README.md @@ -0,0 +1,39 @@ +![LibreSpeed-Android Logo](https://github.com/adolfintel/speedtest-android/blob/master/.github/Readme-Logo.png?raw=true) + +# LibreSpeed Java Library +The LibreSpeed Java Library allows you to performs a speedtest using your existing [LibreSpeed](https://github.com/librespeed/speedtest) server(s) from any java application. + + +## Features +* Download +* Upload +* Ping +* Jitter +* IP Address, ISP, distance from server (optional) +* Telemetry (optional) +* Results sharing (optional) +* Multiple Points of Test (optional) + + +## Server requirements +One or more servers with [LibreSpeed](https://github.com/librespeed/speedtest) installed. + +## Donate +[![Donate with Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/fdossena/donate) +[Donate with PayPal](https://www.paypal.me/sineisochronic) + +## License +Copyright (C) 2019 Federico Dossena + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License +along with this program. If not, see . From e61a2330c854fdd2b5f31746b720304b7a2ef953 Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Fri, 31 Jan 2020 08:49:05 +0100 Subject: [PATCH 07/22] Improve User Agent --- src/main/java/com/fdossena/speedtest/core/Connection.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/fdossena/speedtest/core/Connection.java b/src/main/java/com/fdossena/speedtest/core/Connection.java index 5ef0e82..983ec89 100644 --- a/src/main/java/com/fdossena/speedtest/core/Connection.java +++ b/src/main/java/com/fdossena/speedtest/core/Connection.java @@ -37,8 +37,9 @@ class Connection { private int mode=MODE_NOT_SET; private static final int MODE_NOT_SET=0, MODE_HTTP=1, MODE_HTTPS=2; - private static final String USER_AGENT="LibreSpeed/2.0.0", - LOCALE= Locale.getDefault() != null?Locale.getDefault().toLanguageTag():null; + private static final String USER_AGENT="LibreSpeed/2.0.0 " + + (System.getProperty("http.agent") != null ? System.getProperty("http.agent") : "(" + System.getProperty("os.name") + ")"); + private static final String LOCALE= Locale.getDefault() != null?Locale.getDefault().toLanguageTag():null; Connection(String url, int connectTimeout, int soTimeout, int recvBuffer, int sendBuffer){ boolean tryHTTP=false, tryHTTPS=false; From 80526f8569a7ee0f642fc850cea6bcdc23a3d477 Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Fri, 31 Jan 2020 09:51:56 +0100 Subject: [PATCH 08/22] Add some javadoc --- .../fdossena/speedtest/core/Speedtest.java | 198 +++++++++++++++--- .../fdossena/speedtest/core/TestPoint.java | 19 ++ .../core/config/SpeedtestConfig.java | 34 ++- 3 files changed, 224 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/fdossena/speedtest/core/Speedtest.java b/src/main/java/com/fdossena/speedtest/core/Speedtest.java index 64e54a4..4afc91d 100644 --- a/src/main/java/com/fdossena/speedtest/core/Speedtest.java +++ b/src/main/java/com/fdossena/speedtest/core/Speedtest.java @@ -26,6 +26,12 @@ import com.fdossena.speedtest.core.config.SpeedtestConfig; import com.fdossena.speedtest.core.config.TelemetryConfig; +/** + * A utility class to measure network speed to one or more LibreSpeed servers. + * + * @see LibreSpeed server + */ +@SuppressWarnings("unused") // Public API public class Speedtest { private ArrayList servers=new ArrayList<>(); private TestPoint selectedServer=null; @@ -37,56 +43,116 @@ public class Speedtest { private String originalExtra=""; + /** + * Initialize an instance of a {@link Speedtest} with the default configuration and no servers. + *

+ * Configuration can be added to this object by using {@link #setSpeedtestConfig(SpeedtestConfig)} and {@link #setTelemetryConfig(TelemetryConfig)} + *

+ * Servers can be added with {@link #addTestPoint(TestPoint)}, {@link #addTestPoints(TestPoint[])}, {@link #addTestPoint(JSONObject)} + * or {@link #addTestPoints(JSONArray)} and a server can be selected for the test with {@link #selectServer(ServerSelectedHandler)} or + * {@link #setSelectedServer(TestPoint)} + */ public Speedtest(){ } - public void setSpeedtestConfig(SpeedtestConfig c){ + /** + * Set the configuration for this speed test + * @param speedtestConfig the configuration to set + */ + public void setSpeedtestConfig(SpeedtestConfig speedtestConfig){ synchronized (mutex){ if(state!=0) throw new IllegalStateException("Cannot change config at this moment"); - config=c.clone(); + config=speedtestConfig.clone(); String extra=config.getTelemetry_extra(); if(extra!=null&&!extra.isEmpty()) originalExtra=extra; } } - public void setTelemetryConfig(TelemetryConfig c){ + /** + * Set a telemetry configuration for this speed test + * @param telemetryConfig the configuration to set + */ + public void setTelemetryConfig(TelemetryConfig telemetryConfig){ synchronized (mutex) { if (state != 0) throw new IllegalStateException("Cannot change config at this moment"); - telemetryConfig = c.clone(); + this.telemetryConfig = telemetryConfig.clone(); } } - public void addTestPoint(TestPoint t){ + /** + * Add one server to this speed test. + *

+ * Note that the server is not automatically selected for the speed test and that either {@link Speedtest#selectServer(ServerSelectedHandler)} + * or {@link Speedtest#setSelectedServer(TestPoint)} still needs to be called + * + * @param testPoint The server to add + */ + public void addTestPoint(TestPoint testPoint){ synchronized (mutex) { if (state == 0) state = 1; if (state > 1) throw new IllegalStateException("Cannot add test points at this moment"); - servers.add(t); + servers.add(testPoint); } } - public void addTestPoints(TestPoint[] s){ + /** + * Add servers to this speed test + *

+ * Note that the server is not automatically selected for the speed test and that either {@link Speedtest#selectServer(ServerSelectedHandler)} + * or {@link Speedtest#setSelectedServer(TestPoint)} still needs to be called + * + * @param testPoints The servers to add + */ + public void addTestPoints(TestPoint[] testPoints){ synchronized (mutex) { - for (TestPoint t : s) addTestPoint(t); + for (TestPoint t : testPoints) addTestPoint(t); } } - public void addTestPoint(JSONObject json){ + /** + * Add one server to this speed test. + *

+ * The server is given as a JSON object. This methods parses the JSON object and adds the corresponding server to the list of available + * servers + *

+ * Note that the server is not automatically selected for the speed test and that either {@link Speedtest#selectServer(ServerSelectedHandler)} + * or {@link Speedtest#setSelectedServer(TestPoint)} still needs to be called + * + * @param jsonTestPoint The server to add + */ + public void addTestPoint(JSONObject jsonTestPoint){ synchronized (mutex) { - addTestPoint(new TestPoint(json)); + addTestPoint(new TestPoint(jsonTestPoint)); } } - public void addTestPoints(JSONArray json){ + /** + * Add servers to this speed test. + *

+ * The servers are given as a JSON array. This methods parses the JSON array and adds the corresponding servers to the list of available + * servers + *

+ * Note that the server is not automatically selected for the speed test and that either {@link Speedtest#selectServer(ServerSelectedHandler)} + * or {@link Speedtest#setSelectedServer(TestPoint)} still needs to be called + * + * @param jsonTestPoints The servers to add + */ + public void addTestPoints(JSONArray jsonTestPoints){ synchronized (mutex) { - for (int i = 0; i < json.length(); i++) + for (int i = 0; i < jsonTestPoints.length(); i++) try { - addTestPoint(json.getJSONObject(i)); + addTestPoint(jsonTestPoints.getJSONObject(i)); } catch (JSONException t) { } } } + /** + * Get the servers available for this speed test + * + * @return The available servers + */ public TestPoint[] getTestPoints(){ synchronized (mutex) { return servers.toArray(new TestPoint[0]); @@ -94,6 +160,12 @@ public TestPoint[] getTestPoints(){ } private ServerSelector ss=null; + + /** + * Automatically search for the closest server (by ping) and select it for use in the speed test. + * + * @param callback A handler defining the action to perform when a server has been selected + */ public void selectServer(final ServerSelectedHandler callback){ synchronized (mutex) { if (state == 0) throw new IllegalStateException("No test points added"); @@ -102,7 +174,7 @@ public void selectServer(final ServerSelectedHandler callback){ state = 2; ss = new ServerSelector(getTestPoints(), config.getPing_connectTimeout()) { @Override - public void onServerSelected(TestPoint server) { + void onServerSelected(TestPoint server) { selectedServer = server; synchronized (mutex) { if (server != null) state = 3; else state = 1; @@ -114,16 +186,27 @@ public void onServerSelected(TestPoint server) { } } - public void setSelectedServer(TestPoint t){ + /** + * Manually set the server to user for the speed test + * + * @param testPoint The server to use + */ + public void setSelectedServer(TestPoint testPoint){ synchronized (mutex) { if (state == 2) throw new IllegalStateException("Server selection is in progress"); - if (t == null) throw new IllegalArgumentException("t is null"); - selectedServer = t; + if (testPoint == null) throw new IllegalArgumentException("t is null"); + selectedServer = testPoint; state = 3; } } private SpeedtestWorker st=null; + + /** + * Start the speed test. + * + * @param callback The handler defining the actions to perform when the speed test makes progress + */ public void start(final SpeedtestHandler callback){ synchronized (mutex) { if (state < 3) throw new IllegalStateException("Server hasn't been selected yet"); @@ -139,34 +222,34 @@ public void start(final SpeedtestHandler callback){ } st = new SpeedtestWorker(selectedServer, config, telemetryConfig) { @Override - public void onDownloadUpdate(double dl, double progress) { + void onDownloadUpdate(double dl, double progress) { callback.onDownloadUpdate(dl, progress); } @Override - public void onUploadUpdate(double ul, double progress) { + void onUploadUpdate(double ul, double progress) { callback.onUploadUpdate(ul, progress); } @Override - public void onPingJitterUpdate(double ping, double jitter, double progress) { + void onPingJitterUpdate(double ping, double jitter, double progress) { callback.onPingJitterUpdate(ping, jitter, progress); } @Override - public void onIPInfoUpdate(String ipInfo) { + void onIPInfoUpdate(String ipInfo) { callback.onIPInfoUpdate(ipInfo); } @Override - public void onTestIDReceived(String id) { + void onTestIDReceived(String id) { String shareURL=prepareShareURL(telemetryConfig); if(shareURL!=null) shareURL=String.format(shareURL,id); callback.onTestIDReceived(id,shareURL); } @Override - public void onEnd() { + void onEnd() { synchronized (mutex) { state = 5; } @@ -174,7 +257,7 @@ public void onEnd() { } @Override - public void onCriticalFailure(String err) { + void onCriticalFailure(String err) { synchronized (mutex) { state = 5; } @@ -194,6 +277,11 @@ private String prepareShareURL(TelemetryConfig c){ return server+shareURL; } + /** + * Stop the test whenever possible. + *

+ * Note that some tasks might take some time to finish after calling this method. + */ public void abort(){ synchronized (mutex) { if (state == 2) ss.stopASAP(); @@ -202,16 +290,74 @@ public void abort(){ } } + /** + * A handler to define action to perform when a server has been selected + */ public static abstract class ServerSelectedHandler{ + + /** + * Called when a server has been selected + * + * @param server The selected server + */ public abstract void onServerSelected(TestPoint server); } + + /** + * A handler to define actions to perform when the speed test makes progress. + */ public static abstract class SpeedtestHandler{ - public abstract void onDownloadUpdate(double dl, double progress); - public abstract void onUploadUpdate(double ul, double progress); + /** + * Called when download measurement is actualized. + * + * @param speed The download speed in Mbps + * @param progress The current progress of the download test between 0 and 1 where 0 means that the test hasn't started yet and 1 means that the test is finished + */ + public abstract void onDownloadUpdate(double speed, double progress); + + /** + * Called when upload measurement is actualized. + * + * @param speed The upload speed in Mbps + * @param progress The current progress of the upload test between 0 and 1 where 0 means that the test hasn't started yet and 1 means that the test is finished + */ + public abstract void onUploadUpdate(double speed, double progress); + + /** + * Called when ping measurement is actualized. + * + * @param ping The lowest ping measured in milliseconds + * @param jitter The ping measurements' jitter in milliseconds + * @param progress The current progress of the ping test between 0 and 1 where 0 means that the test hasn't started yet and 1 means that the test is finished + */ public abstract void onPingJitterUpdate(double ping, double jitter, double progress); + + /** + * Called when the client's IP and information about this IP is updated. + * + * @param ipInfo the IP address and its info + */ public abstract void onIPInfoUpdate(String ipInfo); + + /** + * Called when the test result id has been received from the server. + * + * @param id The id of the result + * @param shareURL The url to the image representing the result + */ public abstract void onTestIDReceived(String id, String shareURL); + + + /** + * Called when the test finishes. + */ public abstract void onEnd(); + + /** + * Called if an error occurs during the test + * + * @param err Information about the error + */ public abstract void onCriticalFailure(String err); } } diff --git a/src/main/java/com/fdossena/speedtest/core/TestPoint.java b/src/main/java/com/fdossena/speedtest/core/TestPoint.java index 325a523..a7649d3 100644 --- a/src/main/java/com/fdossena/speedtest/core/TestPoint.java +++ b/src/main/java/com/fdossena/speedtest/core/TestPoint.java @@ -20,10 +20,25 @@ import org.json.JSONException; import org.json.JSONObject; +/** + * The representation of a LibreSpeed server + * + * @see LibreSpeed server + */ public class TestPoint { private final String name, server, dlURL, ulURL, pingURL, getIpURL; protected float ping=-1; + /** + * Create a new instance of {@link TestPoint}. + * + * @param name A user friendly name for the server + * @param server The server's root URL (e.g. https://speedtest.example.com) + * @param dlURL The path to the download address (e.g. backend/garbage.php) + * @param ulURL The path to the upload address (e.g. backend/empty.php) + * @param pingURL The path to the ping address (e.g. backend/empty.php) + * @param getIpURL The path to the address to get the IP info (e.g. backend/getIP.php) + */ public TestPoint(String name, String server, String dlURL, String ulURL, String pingURL, String getIpURL){ this.name=name; this.server=server; @@ -33,6 +48,10 @@ public TestPoint(String name, String server, String dlURL, String ulURL, String this.getIpURL=getIpURL; } + /** + * Create a new instance of {@link TestPoint} from a JSON object. + * @param json the json object to use for this object's creation + */ public TestPoint(JSONObject json){ try { name = json.getString("name"); diff --git a/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java b/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java index 380e89e..7c74433 100644 --- a/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java +++ b/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java @@ -64,7 +64,39 @@ public SpeedtestConfig(){ check(); } - public SpeedtestConfig(int dl_ckSize, int ul_ckSize, int dl_parallelStreams, int ul_parallelStreams, int dl_streamDelay, int ul_streamDelay, double dl_graceTime, double ul_graceTime, int dl_connectTimeout, int dl_soTimeout, int ul_connectTimeout, int ul_soTimeout, int ping_connectTimeout, int ping_soTimeout, int dl_recvBuffer, int dl_sendBuffer, int ul_recvBuffer, int ul_sendBuffer, int ping_recvBuffer, int ping_sendBuffer, String errorHandlingMode, int time_dl_max, int time_ul_max, boolean time_auto, int count_ping, String telemetry_extra, double overheadCompensationFactor, boolean getIP_isp, String getIP_distance, boolean useMebibits, String test_order) { + public SpeedtestConfig( + int dl_ckSize, + int ul_ckSize, + int dl_parallelStreams, + int ul_parallelStreams, + int dl_streamDelay, + int ul_streamDelay, + double dl_graceTime, + double ul_graceTime, + int dl_connectTimeout, + int dl_soTimeout, + int ul_connectTimeout, + int ul_soTimeout, + int ping_connectTimeout, + int ping_soTimeout, + int dl_recvBuffer, + int dl_sendBuffer, + int ul_recvBuffer, + int ul_sendBuffer, + int ping_recvBuffer, + int ping_sendBuffer, + String errorHandlingMode, + int time_dl_max, + int time_ul_max, + boolean time_auto, + int count_ping, + String telemetry_extra, + double overheadCompensationFactor, + boolean getIP_isp, + String getIP_distance, + boolean useMebibits, + String test_order + ) { this.dl_ckSize = dl_ckSize; this.ul_ckSize = ul_ckSize; this.dl_parallelStreams = dl_parallelStreams; From 72a47e95f52417a84691b7ce718d5b524f8e9d62 Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Fri, 31 Jan 2020 11:07:18 +0100 Subject: [PATCH 09/22] Fix License header --- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- settings.gradle | 4 ++-- src/main/java/com/fdossena/speedtest/core/Connection.java | 4 ++-- src/main/java/com/fdossena/speedtest/core/DownloadStream.java | 4 ++-- src/main/java/com/fdossena/speedtest/core/Downloader.java | 4 ++-- src/main/java/com/fdossena/speedtest/core/GetIP.java | 4 ++-- src/main/java/com/fdossena/speedtest/core/Logger.java | 4 ++-- src/main/java/com/fdossena/speedtest/core/PingStream.java | 4 ++-- src/main/java/com/fdossena/speedtest/core/Pinger.java | 4 ++-- src/main/java/com/fdossena/speedtest/core/ServerSelector.java | 4 ++-- src/main/java/com/fdossena/speedtest/core/Speedtest.java | 4 ++-- .../java/com/fdossena/speedtest/core/SpeedtestWorker.java | 4 ++-- src/main/java/com/fdossena/speedtest/core/Telemetry.java | 4 ++-- src/main/java/com/fdossena/speedtest/core/TestPoint.java | 4 ++-- src/main/java/com/fdossena/speedtest/core/UploadStream.java | 4 ++-- src/main/java/com/fdossena/speedtest/core/Uploader.java | 4 ++-- src/main/java/com/fdossena/speedtest/core/Utils.java | 4 ++-- .../com/fdossena/speedtest/core/config/SpeedtestConfig.java | 4 ++-- .../com/fdossena/speedtest/core/config/TelemetryConfig.java | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/build.gradle b/build.gradle index 8c41634..eba4524 100644 --- a/build.gradle +++ b/build.gradle @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ plugins { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 947e5ed..b7526e1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -6,13 +6,13 @@ # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# Foobar is distributed in the hope that it will be useful, +# The LibreSpeed speedtest library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with Foobar. If not, see . +# along with The LibreSpeed speedtest library. If not, see . # #Thu Jan 16 16:00:12 CET 2020 diff --git a/settings.gradle b/settings.gradle index 7daea48..5404c31 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ /* diff --git a/src/main/java/com/fdossena/speedtest/core/Connection.java b/src/main/java/com/fdossena/speedtest/core/Connection.java index 983ec89..8e7acae 100644 --- a/src/main/java/com/fdossena/speedtest/core/Connection.java +++ b/src/main/java/com/fdossena/speedtest/core/Connection.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core; diff --git a/src/main/java/com/fdossena/speedtest/core/DownloadStream.java b/src/main/java/com/fdossena/speedtest/core/DownloadStream.java index 6447cdd..57c058d 100644 --- a/src/main/java/com/fdossena/speedtest/core/DownloadStream.java +++ b/src/main/java/com/fdossena/speedtest/core/DownloadStream.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core; diff --git a/src/main/java/com/fdossena/speedtest/core/Downloader.java b/src/main/java/com/fdossena/speedtest/core/Downloader.java index 9d3065e..3fe7248 100644 --- a/src/main/java/com/fdossena/speedtest/core/Downloader.java +++ b/src/main/java/com/fdossena/speedtest/core/Downloader.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core; diff --git a/src/main/java/com/fdossena/speedtest/core/GetIP.java b/src/main/java/com/fdossena/speedtest/core/GetIP.java index 7888134..5512b46 100644 --- a/src/main/java/com/fdossena/speedtest/core/GetIP.java +++ b/src/main/java/com/fdossena/speedtest/core/GetIP.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core; diff --git a/src/main/java/com/fdossena/speedtest/core/Logger.java b/src/main/java/com/fdossena/speedtest/core/Logger.java index 1729962..f6b6308 100644 --- a/src/main/java/com/fdossena/speedtest/core/Logger.java +++ b/src/main/java/com/fdossena/speedtest/core/Logger.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core; diff --git a/src/main/java/com/fdossena/speedtest/core/PingStream.java b/src/main/java/com/fdossena/speedtest/core/PingStream.java index ff9a259..80e0245 100644 --- a/src/main/java/com/fdossena/speedtest/core/PingStream.java +++ b/src/main/java/com/fdossena/speedtest/core/PingStream.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core; diff --git a/src/main/java/com/fdossena/speedtest/core/Pinger.java b/src/main/java/com/fdossena/speedtest/core/Pinger.java index 89924bc..965a116 100644 --- a/src/main/java/com/fdossena/speedtest/core/Pinger.java +++ b/src/main/java/com/fdossena/speedtest/core/Pinger.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core; diff --git a/src/main/java/com/fdossena/speedtest/core/ServerSelector.java b/src/main/java/com/fdossena/speedtest/core/ServerSelector.java index e23c7ca..3472922 100644 --- a/src/main/java/com/fdossena/speedtest/core/ServerSelector.java +++ b/src/main/java/com/fdossena/speedtest/core/ServerSelector.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core; diff --git a/src/main/java/com/fdossena/speedtest/core/Speedtest.java b/src/main/java/com/fdossena/speedtest/core/Speedtest.java index 4afc91d..373c406 100644 --- a/src/main/java/com/fdossena/speedtest/core/Speedtest.java +++ b/src/main/java/com/fdossena/speedtest/core/Speedtest.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core; diff --git a/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java b/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java index 548786c..d1e6ceb 100644 --- a/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java +++ b/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core; diff --git a/src/main/java/com/fdossena/speedtest/core/Telemetry.java b/src/main/java/com/fdossena/speedtest/core/Telemetry.java index e02a58e..09ddb47 100644 --- a/src/main/java/com/fdossena/speedtest/core/Telemetry.java +++ b/src/main/java/com/fdossena/speedtest/core/Telemetry.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core; diff --git a/src/main/java/com/fdossena/speedtest/core/TestPoint.java b/src/main/java/com/fdossena/speedtest/core/TestPoint.java index a7649d3..da6f968 100644 --- a/src/main/java/com/fdossena/speedtest/core/TestPoint.java +++ b/src/main/java/com/fdossena/speedtest/core/TestPoint.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core; diff --git a/src/main/java/com/fdossena/speedtest/core/UploadStream.java b/src/main/java/com/fdossena/speedtest/core/UploadStream.java index c65834a..1aec497 100644 --- a/src/main/java/com/fdossena/speedtest/core/UploadStream.java +++ b/src/main/java/com/fdossena/speedtest/core/UploadStream.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core; diff --git a/src/main/java/com/fdossena/speedtest/core/Uploader.java b/src/main/java/com/fdossena/speedtest/core/Uploader.java index 770b7c3..fe8e7f9 100644 --- a/src/main/java/com/fdossena/speedtest/core/Uploader.java +++ b/src/main/java/com/fdossena/speedtest/core/Uploader.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core; diff --git a/src/main/java/com/fdossena/speedtest/core/Utils.java b/src/main/java/com/fdossena/speedtest/core/Utils.java index 76739dd..68b791d 100644 --- a/src/main/java/com/fdossena/speedtest/core/Utils.java +++ b/src/main/java/com/fdossena/speedtest/core/Utils.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core; diff --git a/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java b/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java index 7c74433..3183ba7 100644 --- a/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java +++ b/src/main/java/com/fdossena/speedtest/core/config/SpeedtestConfig.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core.config; diff --git a/src/main/java/com/fdossena/speedtest/core/config/TelemetryConfig.java b/src/main/java/com/fdossena/speedtest/core/config/TelemetryConfig.java index 42631a2..2f0c176 100644 --- a/src/main/java/com/fdossena/speedtest/core/config/TelemetryConfig.java +++ b/src/main/java/com/fdossena/speedtest/core/config/TelemetryConfig.java @@ -6,13 +6,13 @@ * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Foobar is distributed in the hope that it will be useful, + * The LibreSpeed speedtest library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public License - * along with Foobar. If not, see . + * along with The LibreSpeed speedtest library. If not, see . */ package com.fdossena.speedtest.core.config; From 9d11687d9b2142fe256dfa677a17502f82639bca Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Fri, 31 Jan 2020 11:11:58 +0100 Subject: [PATCH 10/22] Add code for Maven Central publication --- build.gradle | 1 + gradle.properties | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 gradle.properties diff --git a/build.gradle b/build.gradle index eba4524..c30f67a 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,7 @@ plugins { // Apply the java-library plugin to add support for Java Library id 'java-library' + id "com.vanniktech.maven.publish" version "0.8.0" } repositories { diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..3175aa0 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,32 @@ +# +# This file is part of the LibreSpeed speedtest library. +# +# The LibreSpeed speedtest library is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# The LibreSpeed speedtest library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with The LibreSpeed speedtest library. If not, see . +# + +GROUP=com.fdossena.speedtest.core +VERSION_NAME=2.0.0 + +POM_URL=https://github.com/librespeed/speedtest-android +POM_SCM_URL=https://github.com/librespeed/speedtest-android +POM_SCM_CONNECTION=scm:git:https://github.com/librespeed/speedtest-android +POM_SCM_DEV_CONNECTION=scm:git:https://github.com/librespeed/speedtest-android +POM_LICENCE_NAME=GNU Lesser General Public License v3.0 +POM_LICENCE_URL=https://www.gnu.org/licenses/lgpl-3.0.en.html +POM_LICENCE_DIST=repo +POM_DEVELOPER_ID=adolfintel +POM_DEVELOPER_NAME=Federico Dossena +POM_ARTIFACT_ID=librespeed +POM_NAME=LibreSpeed +POM_PACKAGING=jar \ No newline at end of file From b2b5f1bc2888ebea73ad887e5bb25b8fc30a8fcc Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Tue, 2 Jan 2024 15:08:29 +0100 Subject: [PATCH 11/22] Update gradle --- build.gradle | 5 ++--- gradle/wrapper/gradle-wrapper.properties | 22 ++-------------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index c30f67a..6ccaf7f 100644 --- a/build.gradle +++ b/build.gradle @@ -18,17 +18,16 @@ plugins { // Apply the java-library plugin to add support for Java Library id 'java-library' - id "com.vanniktech.maven.publish" version "0.8.0" } repositories { // Use jcenter for resolving dependencies. // You can declare any Maven/Ivy/file repository here. - jcenter() + mavenCentral() } dependencies { - implementation group: 'org.json', name: 'json', version: '20190722' + implementation group: 'org.json', name: 'json', version: '20231013' } test { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b7526e1..a595206 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,23 +1,5 @@ -# -# This file is part of the LibreSpeed speedtest library. -# -# The LibreSpeed speedtest library is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# The LibreSpeed speedtest library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with The LibreSpeed speedtest library. If not, see . -# - -#Thu Jan 16 16:00:12 CET 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists From d9203f492c752250cdcfddc2fdd70170532f2c38 Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Tue, 2 Jan 2024 15:22:16 +0100 Subject: [PATCH 12/22] Add workflow to publish to github package registry --- .github/workflows/main.yml | 24 ++++++++++++++++++++++ build.gradle | 41 +++++++++++++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..a4c92f3 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,24 @@ +name: Publish package to GitHub Packages +on: + release: + types: [created] +jobs: + publish: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@ccb4328a959376b642e027874838f60f8e596de3 + - name: Publish package + uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 + with: + arguments: publish + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 6ccaf7f..2874f7c 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,27 @@ plugins { // Apply the java-library plugin to add support for Java Library - id 'java-library' + id("java-library") + id("maven-publish") + id("me.qoomon.git-versioning") version("6.4.3") +} + +version = "0.0.0" +gitVersioning.apply { + refs { + branch("main") { + version = "\${ref}-SNAPSHOT" + } + branch(".+") { + version = "\${ref}-\${commit}-SNAPSHOT" + } + tag("v(?.*)") { + version = "\${ref.version}" + } + } + rev { + version = "\${commit}" + } } repositories { @@ -34,3 +54,22 @@ test { // Use junit platform for unit tests useJUnitPlatform() } + +publishing { + repositories { + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/pec0ra/speedtest-android") + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } + } + } + publications { + core(MavenPublication) { + from(components.java) + setGroupId("ch.pec0ra.librespeed") + } + } +} From 0b9cdef94393644710d8e7448edea74226b6d492 Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Tue, 2 Jan 2024 15:31:21 +0100 Subject: [PATCH 13/22] Gradle improvements --- build.gradle | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2874f7c..037271b 100644 --- a/build.gradle +++ b/build.gradle @@ -67,9 +67,12 @@ publishing { } } publications { - core(MavenPublication) { - from(components.java) - setGroupId("ch.pec0ra.librespeed") + gpr(MavenPublication) { + groupId = 'ch.pec0ra' + artifactId = 'librespeed' + version = this.version + + from components.java } } } From 31e7b573bf6375cda150e05752e7a3756840f420 Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Tue, 2 Jan 2024 15:41:04 +0100 Subject: [PATCH 14/22] Accept any tag as version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 037271b..4a2e02c 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ gitVersioning.apply { branch(".+") { version = "\${ref}-\${commit}-SNAPSHOT" } - tag("v(?.*)") { + tag("(?.*)") { version = "\${ref.version}" } } From 90aeca984e197f725b688f081e053a41304bb6e2 Mon Sep 17 00:00:00 2001 From: dosse91 Date: Mon, 9 Mar 2020 14:39:16 +0100 Subject: [PATCH 15/22] The server list can now be loaded from URL; Minor bug fixes --- src/main/java/com/fdossena/speedtest/core/ServerSelector.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/fdossena/speedtest/core/ServerSelector.java b/src/main/java/com/fdossena/speedtest/core/ServerSelector.java index 3472922..278c54a 100644 --- a/src/main/java/com/fdossena/speedtest/core/ServerSelector.java +++ b/src/main/java/com/fdossena/speedtest/core/ServerSelector.java @@ -17,14 +17,13 @@ package com.fdossena.speedtest.core; +import com.fdossena.speedtest.core.config.SpeedtestConfig; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import java.util.ArrayList; -import com.fdossena.speedtest.core.config.SpeedtestConfig; - abstract class ServerSelector { private ArrayList servers=new ArrayList<>(); private static final int PARALLELISM=6; From 382718553f5e6fa4ce1e2d6a9baebdbf02f20815 Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Tue, 2 Jan 2024 15:52:39 +0100 Subject: [PATCH 16/22] Code cleaning --- src/main/java/com/fdossena/speedtest/core/Pinger.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/fdossena/speedtest/core/Pinger.java b/src/main/java/com/fdossena/speedtest/core/Pinger.java index 965a116..d742313 100644 --- a/src/main/java/com/fdossena/speedtest/core/Pinger.java +++ b/src/main/java/com/fdossena/speedtest/core/Pinger.java @@ -19,8 +19,6 @@ import java.io.InputStream; -import com.fdossena.speedtest.core.Connection; - abstract class Pinger extends Thread{ private Connection c; private String path; From 3cc83ce311b631bef78ed34c74bcf7a7dc7258c4 Mon Sep 17 00:00:00 2001 From: dosse91 Date: Sun, 27 Sep 2020 20:26:05 +0200 Subject: [PATCH 17/22] Improved auto test duration formula; Updated to latest gradle etc --- .../java/com/fdossena/speedtest/core/SpeedtestWorker.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java b/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java index d1e6ceb..c2232e3 100644 --- a/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java +++ b/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java @@ -141,8 +141,8 @@ void onError(String err) { for (DownloadStream d : streams) totDownloaded += d.getTotalDownloaded(); double speed = totDownloaded / ((t<100?100:t) / 1000.0); if (config.getTime_auto()) { - double b = (3.2 * speed) / 100000.0; - bonusT += b > 400 ? 400 : b; + double b = (2.5 * speed) / 100000.0; + bonusT += b > 200 ? 200 : b; } double progress = (t + bonusT) / (double) (config.getTime_dl_max() * 1000); speed = (speed * 8 * config.getOverheadCompensationFactor()) / (config.getUseMebibits() ? 1048576.0 : 1000000.0); @@ -193,8 +193,8 @@ void onError(String err) { for (UploadStream u : streams) totUploaded += u.getTotalUploaded(); double speed = totUploaded / ((t<100?100:t) / 1000.0); if (config.getTime_auto()) { - double b = (3.2 * speed) / 100000.0; - bonusT += b > 400 ? 400 : b; + double b = (2.5 * speed) / 100000.0; + bonusT += b > 200 ? 200 : b; } double progress = (t + bonusT) / (double) (config.getTime_ul_max() * 1000); speed = (speed * 8 * config.getOverheadCompensationFactor()) / (config.getUseMebibits() ? 1048576.0 : 1000000.0); From 8b97628ef1acd44da2a17989279af94eea98497f Mon Sep 17 00:00:00 2001 From: dosse91 Date: Mon, 12 Apr 2021 15:05:31 +0200 Subject: [PATCH 18/22] Fixed bug that could cause Connection to use HTTP instead of HTTPS on servers that support both; Updated to latest gradle, android studio, etc; Bumped version to 1.2.3 --- src/main/java/com/fdossena/speedtest/core/Connection.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/fdossena/speedtest/core/Connection.java b/src/main/java/com/fdossena/speedtest/core/Connection.java index 8e7acae..3f10ed9 100644 --- a/src/main/java/com/fdossena/speedtest/core/Connection.java +++ b/src/main/java/com/fdossena/speedtest/core/Connection.java @@ -75,7 +75,7 @@ class Connection { throw new IllegalArgumentException("Malformed URL (Unknown or unspecified protocol)"); } try{ - if(tryHTTPS){ + if(mode == MODE_NOT_SET && tryHTTPS){ SocketFactory factory = SSLSocketFactory.getDefault(); socket=factory.createSocket(); if(connectTimeout>0){ @@ -87,7 +87,7 @@ class Connection { } }catch(Throwable t){} try{ - if(tryHTTP){ + if(mode == MODE_NOT_SET && tryHTTP){ SocketFactory factory = SocketFactory.getDefault(); socket=factory.createSocket(); if(connectTimeout>0) { From 24c2b4e7e0d6c1d28cd22cd13305501d3a56c6de Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Tue, 2 Jan 2024 15:57:01 +0100 Subject: [PATCH 19/22] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index deece1a..d22550c 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ One or more servers with [LibreSpeed](https://github.com/librespeed/speedtest) i [Donate with PayPal](https://www.paypal.me/sineisochronic) ## License -Copyright (C) 2019 Federico Dossena +Copyright (C) 2023 Federico Dossena This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by From e2f5a74f85e57353c9ef1891143f05decbdf7588 Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Tue, 2 Jan 2024 16:07:24 +0100 Subject: [PATCH 20/22] Use "com.fdossena" as package's group id --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4a2e02c..f66a827 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,7 @@ publishing { } publications { gpr(MavenPublication) { - groupId = 'ch.pec0ra' + groupId = 'com.fdossena' artifactId = 'librespeed' version = this.version From 58400279966950ce9565460a329525e733290041 Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Sun, 14 Jan 2024 10:27:09 +0100 Subject: [PATCH 21/22] Add Getting Started to README --- README.md | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/README.md b/README.md index d22550c..1754818 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,92 @@ The LibreSpeed Java Library allows you to performs a speedtest using your existi ## Server requirements One or more servers with [LibreSpeed](https://github.com/librespeed/speedtest) installed. +## Getting Started + +Create a `Speedtest` instance: + +```java +Speedtest speedtest = new Speedtest(); +``` + +Add at least one `TestPoint` to your instance +```java +TestPoint testPoint = new TestPoint( + "Testpoint name", + "https://librespeed.org/", + "backend/garbage.php", + "backend/empty.php", + "backend/empty.php", + "backend/getIP.php" +); +speedtest.addTestPoint(testPoint); +``` + +Customize configuration (Optional) +```java +SpeedtestConfig config = new SpeedtestConfig(); +config.setDl_ckSize(200); +// ... +speedtest.setSpeedtestConfig(config); +``` + +Add a telemetry config (Optional) +```java +TelemetryConfig telemetryConfig = new TelemetryConfig( + "full", + "https://speedtest-local.pec0ra.ch", + "results/telemetry.php", + "results/?id=%s" +); +speedtest.setTelemetryConfig(telemetryConfig); +``` + +Create a `SpeedtestHandler` +```java +Speedtest.SpeedtestHandler speedtestHandler = new Speedtest.SpeedtestHandler() { + @Override + public void onTestIDReceived(String id, String shareURL) { + log.info("Id: {} url: {}", id, shareURL); + } + + @Override + public void onDownloadUpdate(double speed, double progress) { + log.info("Download: {} - {}", speed, progress); + } + + @Override + public void onUploadUpdate(double speed, double progress) { + log.info("Upload: {} - {}", speed, progress); + } + + @Override + public void onPingJitterUpdate(double ping, double jitter, double progress) { + log.info("Ping: {}:{} - {}", ping, jitter, progress); + } + + @Override + public void onIPInfoUpdate(String ipInfo) { + log.info("IP Info: {}", ipInfo); + } + + @Override + public void onEnd() { + log.info("Test finished"); + } + + @Override + public void onCriticalFailure(String err) { + log.error("Critical failure: {}", err); + } +}; +``` + +Start the test +```java +speedtest.start(speedtestHandler); +``` + + ## Donate [![Donate with Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/fdossena/donate) [Donate with PayPal](https://www.paypal.me/sineisochronic) From 9b82e42db0997bf7da774c68629d161defd061a9 Mon Sep 17 00:00:00 2001 From: Basile Maret Date: Sun, 14 Jan 2024 10:29:13 +0100 Subject: [PATCH 22/22] Code cleaning --- README.md | 2 +- .../java/com/fdossena/speedtest/core/Connection.java | 5 ++--- .../java/com/fdossena/speedtest/core/Downloader.java | 3 --- src/main/java/com/fdossena/speedtest/core/GetIP.java | 6 ++---- .../java/com/fdossena/speedtest/core/Speedtest.java | 5 ++--- .../com/fdossena/speedtest/core/SpeedtestWorker.java | 12 +----------- .../java/com/fdossena/speedtest/core/Telemetry.java | 6 ++---- .../com/fdossena/speedtest/core/UploadStream.java | 2 +- .../java/com/fdossena/speedtest/core/Uploader.java | 2 -- 9 files changed, 11 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 1754818..6d07bf8 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Add a telemetry config (Optional) ```java TelemetryConfig telemetryConfig = new TelemetryConfig( "full", - "https://speedtest-local.pec0ra.ch", + "https://librespeed.org", "results/telemetry.php", "results/?id=%s" ); diff --git a/src/main/java/com/fdossena/speedtest/core/Connection.java b/src/main/java/com/fdossena/speedtest/core/Connection.java index 3f10ed9..035e89f 100644 --- a/src/main/java/com/fdossena/speedtest/core/Connection.java +++ b/src/main/java/com/fdossena/speedtest/core/Connection.java @@ -17,6 +17,8 @@ package com.fdossena.speedtest.core; +import javax.net.SocketFactory; +import javax.net.ssl.SSLSocketFactory; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; @@ -28,9 +30,6 @@ import java.util.HashMap; import java.util.Locale; -import javax.net.SocketFactory; -import javax.net.ssl.SSLSocketFactory; - class Connection { private Socket socket; private String host; private int port; diff --git a/src/main/java/com/fdossena/speedtest/core/Downloader.java b/src/main/java/com/fdossena/speedtest/core/Downloader.java index 3fe7248..420c21d 100644 --- a/src/main/java/com/fdossena/speedtest/core/Downloader.java +++ b/src/main/java/com/fdossena/speedtest/core/Downloader.java @@ -19,9 +19,6 @@ import java.io.InputStream; -import com.fdossena.speedtest.core.Connection; -import com.fdossena.speedtest.core.Utils; - abstract class Downloader extends Thread{ private Connection c; private String path; diff --git a/src/main/java/com/fdossena/speedtest/core/GetIP.java b/src/main/java/com/fdossena/speedtest/core/GetIP.java index 5512b46..2e602be 100644 --- a/src/main/java/com/fdossena/speedtest/core/GetIP.java +++ b/src/main/java/com/fdossena/speedtest/core/GetIP.java @@ -17,13 +17,11 @@ package com.fdossena.speedtest.core; +import com.fdossena.speedtest.core.config.SpeedtestConfig; + import java.io.BufferedReader; import java.util.HashMap; -import com.fdossena.speedtest.core.config.SpeedtestConfig; -import com.fdossena.speedtest.core.Connection; -import com.fdossena.speedtest.core.Utils; - abstract class GetIP extends Thread{ private Connection c; private String path; diff --git a/src/main/java/com/fdossena/speedtest/core/Speedtest.java b/src/main/java/com/fdossena/speedtest/core/Speedtest.java index 373c406..510e1c0 100644 --- a/src/main/java/com/fdossena/speedtest/core/Speedtest.java +++ b/src/main/java/com/fdossena/speedtest/core/Speedtest.java @@ -17,15 +17,14 @@ package com.fdossena.speedtest.core; +import com.fdossena.speedtest.core.config.SpeedtestConfig; +import com.fdossena.speedtest.core.config.TelemetryConfig; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import java.util.ArrayList; -import com.fdossena.speedtest.core.config.SpeedtestConfig; -import com.fdossena.speedtest.core.config.TelemetryConfig; - /** * A utility class to measure network speed to one or more LibreSpeed servers. * diff --git a/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java b/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java index c2232e3..83c7028 100644 --- a/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java +++ b/src/main/java/com/fdossena/speedtest/core/SpeedtestWorker.java @@ -17,19 +17,9 @@ package com.fdossena.speedtest.core; -import org.json.JSONObject; - -import com.fdossena.speedtest.core.Connection; -import com.fdossena.speedtest.core.Utils; import com.fdossena.speedtest.core.config.SpeedtestConfig; import com.fdossena.speedtest.core.config.TelemetryConfig; -import com.fdossena.speedtest.core.DownloadStream; -import com.fdossena.speedtest.core.GetIP; -import com.fdossena.speedtest.core.Logger; -import com.fdossena.speedtest.core.PingStream; -import com.fdossena.speedtest.core.TestPoint; -import com.fdossena.speedtest.core.Telemetry; -import com.fdossena.speedtest.core.UploadStream; +import org.json.JSONObject; import java.util.Locale; diff --git a/src/main/java/com/fdossena/speedtest/core/Telemetry.java b/src/main/java/com/fdossena/speedtest/core/Telemetry.java index 09ddb47..1ea72e3 100644 --- a/src/main/java/com/fdossena/speedtest/core/Telemetry.java +++ b/src/main/java/com/fdossena/speedtest/core/Telemetry.java @@ -17,13 +17,11 @@ package com.fdossena.speedtest.core; +import com.fdossena.speedtest.core.config.TelemetryConfig; + import java.io.PrintStream; import java.util.HashMap; -import com.fdossena.speedtest.core.config.TelemetryConfig; -import com.fdossena.speedtest.core.Connection; -import com.fdossena.speedtest.core.Utils; - abstract class Telemetry extends Thread{ private Connection c; private String path; diff --git a/src/main/java/com/fdossena/speedtest/core/UploadStream.java b/src/main/java/com/fdossena/speedtest/core/UploadStream.java index 1aec497..b978176 100644 --- a/src/main/java/com/fdossena/speedtest/core/UploadStream.java +++ b/src/main/java/com/fdossena/speedtest/core/UploadStream.java @@ -25,7 +25,7 @@ abstract class UploadStream { private int connectTimeout, soTimeout, recvBuffer, sendBuffer; private Connection c=null; private Uploader uploader; - private String errorHandlingMode= SpeedtestConfig.ONERROR_ATTEMPT_RESTART; + private String errorHandlingMode; private long currentUploaded=0, previouslyUploaded=0; private boolean stopASAP=false; private Logger log; diff --git a/src/main/java/com/fdossena/speedtest/core/Uploader.java b/src/main/java/com/fdossena/speedtest/core/Uploader.java index fe8e7f9..d61776e 100644 --- a/src/main/java/com/fdossena/speedtest/core/Uploader.java +++ b/src/main/java/com/fdossena/speedtest/core/Uploader.java @@ -20,8 +20,6 @@ import java.io.OutputStream; import java.util.Random; -import com.fdossena.speedtest.core.Connection; - abstract class Uploader extends Thread{ private Connection c; private String path;