diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 0a04128..0000000 --- a/LICENSE +++ /dev/null @@ -1,165 +0,0 @@ - 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/README.md b/README.md index 8058fe9..ee5805e 100644 --- a/README.md +++ b/README.md @@ -1,145 +1 @@ -# This branch has been moved to [librespeed/speedtest-go](https://github.com/librespeed/speedtest-go). No further updates will be pushed into this branch. - ---- - -![LibreSpeed Logo](https://github.com/librespeed/speedtest/blob/master/.logo/logo3.png?raw=true) - -# LibreSpeed - -No Flash, No Java, No WebSocket, No Bullshit. - -This is a very lightweight speed test implemented in JavaScript, using XMLHttpRequest and Web Workers. - -## Try it -[Take a speed test](https://speedtest.fdossena.com) (PHP implementation) - -## Compatibility -All modern browsers are supported: IE11, latest Edge, latest Chrome, latest Firefox, latest Safari. -Works with mobile versions too. - -## Features -* Download -* Upload -* Ping -* Jitter -* IP Address, ISP, distance from server (optional) -* Telemetry (optional) -* Results sharing (optional) -* Multiple Points of Test (optional) -* Compatible with PHP frontend predefined endpoints (with `.php` suffixes) - -![Screenshot](https://speedtest.fdossena.com/mpot_v6.gif) - -## Server requirements -* Any [Go supported platforms](https://github.com/golang/go/wiki/MinimumRequirements) -* BoltDB, PostgreSQL or MySQL database to store test results (optional) -* A fast! Internet connection - -## Installation - -You need Go 1.13+ to compile the binary. If you have an older version of Go and don't want to install the tarball -manually, you can install newer version of Go into your GOPATH: - -0. Install Go 1.14 - - ``` - $ go get golang.org/dl/go1.14.2 - # Assuming your GOPATH is default (~/go), Go 1.14.2 will be installed in ~/go/bin - $ ~/go/bin/go1.14.2 version - go version go1.14.2 linux/amd64 - ``` - -1. Clone this repository: - - ``` - $ git clone github.com/librespeed/speedtest - # Switch to the Go branch - $ git checkout go - ``` - -2. Build - ``` - # Change current working directory to the repository - $ cd speedtest - # Compile - $ go build -ldflags "-w -s" -trimpath -o speedtest main.go - ``` - -3. Copy the `assets` directory, `settings.toml` file along with the compiled `speedtest` binary into a single directory - -4. If you have telemetry enabled, - - For PostgreSQL/MySQL, create database and import the corresponding `.sql` file under `database/{postgresql,mysql}` - - ``` - # assume you have already created a database named `speedtest` under current user - $ psql speedtest < database/postgresql/telemetry_postgresql.sql - ``` - - - For embedded BoltDB, make sure to define the `database_file` path in `settings.toml`: - - ``` - database_file="speedtest.db" - ``` - -5. Put `assets` folder under the same directory as your compiled binary. - - Make sure the font files and JavaScripts are in the `assets` directory - - You can have multiple HTML pages under `assets` directory. They can be access directly under the server root - (e.g. `/example-singleServer-full.html`) - - It's possible to have a default page mapped to `/`, simply put a file named `index.html` under `assets` - -6. Change `settings.toml` according to your environment: - - ```toml - # bind address, use empty string to bind to all interfaces - bind_address="127.0.0.1" - # backend listen port, default is 8989 - listen_port=8989 - # Server location, use zeroes to fetch from API automatically - server_lat=0 - server_lng=0 - # ipinfo.io API key, if applicable - ipinfo_api_key="" - - # password for logging into statistics page, change this to enable stats page - statistics_password="PASSWORD" - # redact IP addresses - redact_ip_addresses=false - - # database type for statistics data, currently supports: bolt, mysql, postgresql - database_type="postgresql" - database_hostname="localhost" - database_name="speedtest" - database_username="postgres" - database_password="" - - # if you use `bolt` as database, set database_file to database file location - database_file="speedtest.db" - ``` - -## Differences between Go and PHP implementation and caveats - -- Since there is no CGo-free SQLite implementation available, I've opted to use [BoltDB](https://github.com/etcd-io/bbolt) - instead, as an embedded database alternative to SQLite -- Test IDs are generated ULID, there is no option to change them to plain ID -- You can use the same HTML template from the PHP implementation -- Server location can be defined in settings -- There might be a slight delay on program start if your Internet connection is slow. That's because the program will -attempt to fetch your current network's ISP info for distance calculation between your network and the speed test client's. -This action will only be taken once, and cached for later use. - -## License -Copyright (C) 2016-2020 Federico Dossena -Copyright (C) 2020 Maddie Zhan - -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 . +The Go backend implementation has been moved to its own repo here: [librespeed/speedtest-go](https://github.com/librespeed/speedtest-go). No further updates will be pushed into this branch. diff --git a/assets/NotoSansDisplay-Light.ttf b/assets/NotoSansDisplay-Light.ttf deleted file mode 100644 index 368b049..0000000 Binary files a/assets/NotoSansDisplay-Light.ttf and /dev/null differ diff --git a/assets/NotoSansDisplay-Medium.ttf b/assets/NotoSansDisplay-Medium.ttf deleted file mode 100644 index 9e62d58..0000000 Binary files a/assets/NotoSansDisplay-Medium.ttf and /dev/null differ diff --git a/assets/example-multipleServers-full.html b/assets/example-multipleServers-full.html deleted file mode 100644 index a4c6b1a..0000000 --- a/assets/example-multipleServers-full.html +++ /dev/null @@ -1,461 +0,0 @@ - - - - - - - - - -LibreSpeed Example - - -

LibreSpeed Example

-
-

Selecting a server...

-
- - - - diff --git a/assets/example-multipleServers-pretty.html b/assets/example-multipleServers-pretty.html deleted file mode 100644 index 6ed98ab..0000000 --- a/assets/example-multipleServers-pretty.html +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - -LibreSpeed Example - - - - - - -

LibreSpeed Example

-
-
Selecting server...
-
-
-
-
Download
-
-
Mbit/s
-
-
-
Upload
-
-
Mbit/s
-
-
-
-
-
Ping
-
-
ms
-
-
-
Jitter
-
-
ms
-
-
-
- IP Address: -
-
-Source code - - - diff --git a/assets/example-singleServer-basic.html b/assets/example-singleServer-basic.html deleted file mode 100644 index 810c548..0000000 --- a/assets/example-singleServer-basic.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - LibreSpeed Example - - - - -

LibreSpeed Example

- -

IP Address

-

- -

Download

-

- -

Upload

-

- -

Latency

-

- - - - Source code - - - diff --git a/assets/example-singleServer-chart.html b/assets/example-singleServer-chart.html deleted file mode 100644 index d0040e3..0000000 --- a/assets/example-singleServer-chart.html +++ /dev/null @@ -1,256 +0,0 @@ - - - - - LibreSpeed Example - - - - - - - - -

LibreSpeed - Chart.js example

- - Run speedtest -

Charts by Chart.js

Source code - - diff --git a/assets/example-singleServer-customSettings.html b/assets/example-singleServer-customSettings.html deleted file mode 100644 index 1a06f89..0000000 --- a/assets/example-singleServer-customSettings.html +++ /dev/null @@ -1,174 +0,0 @@ - - - - - -LibreSpeed Example - - - - - - - -

LibreSpeed Example

-
-
-
-
-
Download
-
-
Mbit/s
-
-
-
Upload
-
-
Mbit/s
-
-
-
-Source code - - - diff --git a/assets/example-singleServer-full.html b/assets/example-singleServer-full.html deleted file mode 100644 index 34a4bf4..0000000 --- a/assets/example-singleServer-full.html +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - - - - -LibreSpeed Example - - -

LibreSpeed Example

-
-

- Privacy -
-
-
-
Ping
-
-
ms
-
-
-
Jitter
-
-
ms
-
-
-
-
-
Download
- -
-
Mbit/s
-
-
-
Upload
- -
-
Mbit/s
-
-
-
- -
- -
- Source code -
- - - - diff --git a/assets/example-singleServer-gauges.html b/assets/example-singleServer-gauges.html deleted file mode 100644 index 0b6c388..0000000 --- a/assets/example-singleServer-gauges.html +++ /dev/null @@ -1,262 +0,0 @@ - - - - - - - - - -LibreSpeed Example - - -

LibreSpeed Example

-
-
-
-
-
-
Ping
-
-
ms
-
-
-
Jitter
-
-
ms
-
-
-
-
-
Download
- -
-
Mbit/s
-
-
-
Upload
- -
-
Mbit/s
-
-
-
- -
-
- Source code -
- - - diff --git a/assets/example-singleServer-pretty.html b/assets/example-singleServer-pretty.html deleted file mode 100644 index eca431b..0000000 --- a/assets/example-singleServer-pretty.html +++ /dev/null @@ -1,192 +0,0 @@ - - - - - -LibreSpeed Example - - - - - - - -

LibreSpeed Example

-
-
-
-
-
Download
-
-
Mbit/s
-
-
-
Upload
-
-
Mbit/s
-
-
-
-
-
Ping
-
-
ms
-
-
-
Jitter
-
-
ms
-
-
-
- IP Address: -
-
-Source code - - - diff --git a/assets/example-singleServer-progressBar.html b/assets/example-singleServer-progressBar.html deleted file mode 100644 index ce037b6..0000000 --- a/assets/example-singleServer-progressBar.html +++ /dev/null @@ -1,212 +0,0 @@ - - - - - -LibreSpeed Example - - - - - - - -

LibreSpeed Example

-
-
-
-
-
-
Download
-
-
Mbit/s
-
-
-
Upload
-
-
Mbit/s
-
-
-
-
-
Ping
-
-
ms
-
-
-
Jitter
-
-
ms
-
-
-
- IP Address: -
-
-Source code - - - diff --git a/assets/speedtest.js b/assets/speedtest.js deleted file mode 100644 index 41df073..0000000 --- a/assets/speedtest.js +++ /dev/null @@ -1,379 +0,0 @@ -/* - LibreSpeed - Main - by Federico Dossena - https://github.com/librespeed/speedtest/ - GNU LGPLv3 License -*/ - -/* - This is the main interface between your webpage and the speedtest. - It hides the speedtest web worker to the page, and provides many convenient functions to control the test. - - The best way to learn how to use this is to look at the basic example, but here's some documentation. - - To initialize the test, create a new Speedtest object: - var s=new Speedtest(); - Now you can think of this as a finite state machine. These are the states (use getState() to see them): - - 0: here you can change the speedtest settings (such as test duration) with the setParameter("parameter",value) method. From here you can either start the test using start() (goes to state 3) or you can add multiple test points using addTestPoint(server) or addTestPoints(serverList) (goes to state 1). Additionally, this is the perfect moment to set up callbacks for the onupdate(data) and onend(aborted) events. - - 1: here you can add test points. You only need to do this if you want to use multiple test points. - A server is defined as an object like this: - { - name: "User friendly name", - server:"http://yourBackend.com/", <---- URL to your server. You can specify http:// or https://. If your server supports both, just write // without the protocol - dlURL:"garbage.php" <----- path to garbage.php or its replacement on the server - ulURL:"empty.php" <----- path to empty.php or its replacement on the server - pingURL:"empty.php" <----- path to empty.php or its replacement on the server. This is used to ping the server by this selector - getIpURL:"getIP.php" <----- path to getIP.php or its replacement on the server - } - While in state 1, you can only add test points, you cannot change the test settings. When you're done, use selectServer(callback) to select the test point with the lowest ping. This is asynchronous, when it's done, it will call your callback function and move to state 2. Calling setSelectedServer(server) will manually select a server and move to state 2. - - 2: test point selected, ready to start the test. Use start() to begin, this will move to state 3 - - 3: test running. Here, your onupdate event calback will be called periodically, with data coming from the worker about speed and progress. A data object will be passed to your onupdate function, with the following items: - - dlStatus: download speed in Mbit/s - - ulStatus: upload speed in Mbit/s - - pingStatus: ping in ms - - jitterStatus: jitter in ms - - dlProgress: progress of the download test as a float 0-1 - - ulProgress: progress of the upload test as a float 0-1 - - pingProgress: progress of the ping/jitter test as a float 0-1 - - testState: state of the test (-1=not started, 0=starting, 1=download test, 2=ping+jitter test, 3=upload test, 4=finished, 5=aborted) - - clientIp: IP address of the client performing the test (and optionally ISP and distance) - At the end of the test, the onend function will be called, with a boolean specifying whether the test was aborted or if it ended normally. - The test can be aborted at any time with abort(). - At the end of the test, it will move to state 4 - - 4: test finished. You can run it again by calling start() if you want. - */ - -function Speedtest() { - this._serverList = []; //when using multiple points of test, this is a list of test points - this._selectedServer = null; //when using multiple points of test, this is the selected server - this._settings = {}; //settings for the speedtest worker - this._state = 0; //0=adding settings, 1=adding servers, 2=server selection done, 3=test running, 4=done - console.log( - "LibreSpeed by Federico Dossena v5.2 - https://github.com/librespeed/speedtest" - ); -} - -Speedtest.prototype = { - constructor: Speedtest, - /** - * Returns the state of the test: 0=adding settings, 1=adding servers, 2=server selection done, 3=test running, 4=done - */ - getState: function() { - return this._state; - }, - /** - * Change one of the test settings from their defaults. - * - parameter: string with the name of the parameter that you want to set - * - value: new value for the parameter - * - * Invalid values or nonexistant parameters will be ignored by the speedtest worker. - */ - setParameter: function(parameter, value) { - if (this._state != 0) - throw "You cannot change the test settings after adding server or starting the test"; - this._settings[parameter] = value; - if(parameter === "temeletry_extra"){ - this._originalExtra=this._settings.telemetry_extra; - } - }, - /** - * Used internally to check if a server object contains all the required elements. - * Also fixes the server URL if needed. - */ - _checkServerDefinition: function(server) { - try { - if (typeof server.name !== "string") - throw "Name string missing from server definition (name)"; - if (typeof server.server !== "string") - throw "Server address string missing from server definition (server)"; - if (server.server.charAt(server.server.length - 1) != "/") - server.server += "/"; - if (server.server.indexOf("//") == 0) - server.server = location.protocol + server.server; - if (typeof server.dlURL !== "string") - throw "Download URL string missing from server definition (dlURL)"; - if (typeof server.ulURL !== "string") - throw "Upload URL string missing from server definition (ulURL)"; - if (typeof server.pingURL !== "string") - throw "Ping URL string missing from server definition (pingURL)"; - if (typeof server.getIpURL !== "string") - throw "GetIP URL string missing from server definition (getIpURL)"; - } catch (e) { - throw "Invalid server definition"; - } - }, - /** - * Add a test point (multiple points of test) - * server: the server to be added as an object. Must contain the following elements: - * { - * name: "User friendly name", - * server:"http://yourBackend.com/", URL to your server. You can specify http:// or https://. If your server supports both, just write // without the protocol - * dlURL:"garbage.php" path to garbage.php or its replacement on the server - * ulURL:"empty.php" path to empty.php or its replacement on the server - * pingURL:"empty.php" path to empty.php or its replacement on the server. This is used to ping the server by this selector - * getIpURL:"getIP.php" path to getIP.php or its replacement on the server - * } - */ - addTestPoint: function(server) { - this._checkServerDefinition(server); - if (this._state == 0) this._state = 1; - if (this._state != 1) throw "You can't add a server after server selection"; - this._settings.mpot = true; - this._serverList.push(server); - }, - /** - * Same as addTestPoint, but you can pass an array of servers - */ - addTestPoints: function(list) { - for (var i = 0; i < list.length; i++) this.addTestPoint(list[i]); - }, - /** - * Load a JSON server list from URL (multiple points of test) - * url: the url where the server list can be fetched. Must be an array with objects containing the following elements: - * { - * "name": "User friendly name", - * "server":"http://yourBackend.com/", URL to your server. You can specify http:// or https://. If your server supports both, just write // without the protocol - * "dlURL":"garbage.php" path to garbage.php or its replacement on the server - * "ulURL":"empty.php" path to empty.php or its replacement on the server - * "pingURL":"empty.php" path to empty.php or its replacement on the server. This is used to ping the server by this selector - * "getIpURL":"getIP.php" path to getIP.php or its replacement on the server - * } - * result: callback to be called when the list is loaded correctly. An array with the loaded servers will be passed to this function, or null if it failed - */ - loadServerList: function(url,result) { - if (this._state == 0) this._state = 1; - if (this._state != 1) throw "You can't add a server after server selection"; - this._settings.mpot = true; - var xhr = new XMLHttpRequest(); - xhr.onload = function(){ - try{ - var servers=JSON.parse(xhr.responseText); - for(var i=0;i= 3) - throw "You can't select a server while the test is running"; - } - if (this._selectServerCalled) throw "selectServer already called"; else this._selectServerCalled=true; - /*this function goes through a list of servers. For each server, the ping is measured, then the server with the function result is called with the best server, or null if all the servers were down. - */ - var select = function(serverList, result) { - //pings the specified URL, then calls the function result. Result will receive a parameter which is either the time it took to ping the URL, or -1 if something went wrong. - var PING_TIMEOUT = 2000; - var USE_PING_TIMEOUT = true; //will be disabled on unsupported browsers - if (/MSIE.(\d+\.\d+)/i.test(navigator.userAgent)) { - //IE11 doesn't support XHR timeout - USE_PING_TIMEOUT = false; - } - var ping = function(url, result) { - url += (url.match(/\?/) ? "&" : "?") + "cors=true"; - var xhr = new XMLHttpRequest(); - var t = new Date().getTime(); - xhr.onload = function() { - if (xhr.responseText.length == 0) { - //we expect an empty response - var instspd = new Date().getTime() - t; //rough timing estimate - try { - //try to get more accurate timing using performance API - var p = performance.getEntriesByName(url); - p = p[p.length - 1]; - var d = p.responseStart - p.requestStart; - if (d <= 0) d = p.duration; - if (d > 0 && d < instspd) instspd = d; - } catch (e) {} - result(instspd); - } else result(-1); - }.bind(this); - xhr.onerror = function() { - result(-1); - }.bind(this); - xhr.open("GET", url); - if (USE_PING_TIMEOUT) { - try { - xhr.timeout = PING_TIMEOUT; - xhr.ontimeout = xhr.onerror; - } catch (e) {} - } - xhr.send(); - }.bind(this); - - //this function repeatedly pings a server to get a good estimate of the ping. When it's done, it calls the done function without parameters. At the end of the execution, the server will have a new parameter called pingT, which is either the best ping we got from the server or -1 if something went wrong. - var PINGS = 3, //up to 3 pings are performed, unless the server is down... - SLOW_THRESHOLD = 500; //...or one of the pings is above this threshold - var checkServer = function(server, done) { - var i = 0; - server.pingT = -1; - if (server.server.indexOf(location.protocol) == -1) done(); - else { - var nextPing = function() { - if (i++ == PINGS) { - done(); - return; - } - ping( - server.server + server.pingURL, - function(t) { - if (t >= 0) { - if (t < server.pingT || server.pingT == -1) server.pingT = t; - if (t < SLOW_THRESHOLD) nextPing(); - else done(); - } else done(); - }.bind(this) - ); - }.bind(this); - nextPing(); - } - }.bind(this); - //check servers in list, one by one - var i = 0; - var done = function() { - var bestServer = null; - for (var i = 0; i < serverList.length; i++) { - if ( - serverList[i].pingT != -1 && - (bestServer == null || serverList[i].pingT < bestServer.pingT) - ) - bestServer = serverList[i]; - } - result(bestServer); - }.bind(this); - var nextServer = function() { - if (i == serverList.length) { - done(); - return; - } - checkServer(serverList[i++], nextServer); - }.bind(this); - nextServer(); - }.bind(this); - - //parallel server selection - var CONCURRENCY = 6; - var serverLists = []; - for (var i = 0; i < CONCURRENCY; i++) { - serverLists[i] = []; - } - for (var i = 0; i < this._serverList.length; i++) { - serverLists[i % CONCURRENCY].push(this._serverList[i]); - } - var completed = 0; - var bestServer = null; - for (var i = 0; i < CONCURRENCY; i++) { - select( - serverLists[i], - function(server) { - if (server != null) { - if (bestServer == null || server.pingT < bestServer.pingT) - bestServer = server; - } - completed++; - if (completed == CONCURRENCY) { - this._selectedServer = bestServer; - this._state = 2; - if (result) result(bestServer); - } - }.bind(this) - ); - } - }, - /** - * Starts the test. - * During the test, the onupdate(data) callback function will be called periodically with data from the worker. - * At the end of the test, the onend(aborted) function will be called with a boolean telling you if the test was aborted or if it ended normally. - */ - start: function() { - if (this._state == 3) throw "Test already running"; - this.worker = new Worker("speedtest_worker.js?r=" + Math.random()); - this.worker.onmessage = function(e) { - if (e.data === this._prevData) return; - else this._prevData = e.data; - var data = JSON.parse(e.data); - try { - if (this.onupdate) this.onupdate(data); - } catch (e) { - console.error("Speedtest onupdate event threw exception: " + e); - } - if (data.testState >= 4) { - try { - if (this.onend) this.onend(data.testState == 5); - } catch (e) { - console.error("Speedtest onend event threw exception: " + e); - } - clearInterval(this.updater); - this._state = 4; - } - }.bind(this); - this.updater = setInterval( - function() { - this.worker.postMessage("status"); - }.bind(this), - 200 - ); - if (this._state == 1) - throw "When using multiple points of test, you must call selectServer before starting the test"; - if (this._state == 2) { - this._settings.url_dl = - this._selectedServer.server + this._selectedServer.dlURL; - this._settings.url_ul = - this._selectedServer.server + this._selectedServer.ulURL; - this._settings.url_ping = - this._selectedServer.server + this._selectedServer.pingURL; - this._settings.url_getIp = - this._selectedServer.server + this._selectedServer.getIpURL; - if (typeof this._originalExtra !== "undefined") { - this._settings.telemetry_extra = JSON.stringify({ - server: this._selectedServer.name, - extra: this._originalExtra - }); - } else - this._settings.telemetry_extra = JSON.stringify({ - server: this._selectedServer.name - }); - } - this._state = 3; - this.worker.postMessage("start " + JSON.stringify(this._settings)); - }, - /** - * Aborts the test while it's running. - */ - abort: function() { - if (this._state < 3) throw "You cannot abort a test that's not started yet"; - if (this._state < 4) this.worker.postMessage("abort"); - } -}; diff --git a/assets/speedtest_worker.js b/assets/speedtest_worker.js deleted file mode 100644 index 16164aa..0000000 --- a/assets/speedtest_worker.js +++ /dev/null @@ -1,723 +0,0 @@ -/* - LibreSpeed - Worker - by Federico Dossena - https://github.com/librespeed/speedtest/ - GNU LGPLv3 License -*/ - -// data reported to main thread -var testState = -1; // -1=not started, 0=starting, 1=download test, 2=ping+jitter test, 3=upload test, 4=finished, 5=abort -var dlStatus = ""; // download speed in Mbit/s with 2 decimal digits -var ulStatus = ""; // upload speed in Mbit/s with 2 decimal digits -var pingStatus = ""; // ping in milliseconds with 2 decimal digits -var jitterStatus = ""; // jitter in milliseconds with 2 decimal digits -var clientIp = ""; // client's IP address as reported by getIP -var dlProgress = 0; //progress of download test 0-1 -var ulProgress = 0; //progress of upload test 0-1 -var pingProgress = 0; //progress of ping+jitter test 0-1 -var testId = null; //test ID (sent back by telemetry if used, null otherwise) - -var log = ""; //telemetry log -function tlog(s) { - if (settings.telemetry_level >= 2) { - log += Date.now() + ": " + s + "\n"; - } -} -function tverb(s) { - if (settings.telemetry_level >= 3) { - log += Date.now() + ": " + s + "\n"; - } -} -function twarn(s) { - if (settings.telemetry_level >= 2) { - log += Date.now() + " WARN: " + s + "\n"; - } - console.warn(s); -} - -// test settings. can be overridden by sending specific values with the start command -var settings = { - mpot: false, //set to true when in MPOT mode - test_order: "IP_D_U", //order in which tests will be performed as a string. D=Download, U=Upload, P=Ping+Jitter, I=IP, _=1 second delay - time_ul_max: 15, // max duration of upload test in seconds - time_dl_max: 15, // max duration of download test in seconds - time_auto: true, // if set to true, tests will take less time on faster connections - time_ulGraceTime: 3, //time to wait in seconds before actually measuring ul speed (wait for buffers to fill) - time_dlGraceTime: 1.5, //time to wait in seconds before actually measuring dl speed (wait for TCP window to increase) - count_ping: 10, // number of pings to perform in ping test - url_dl: "backend/garbage", // path to a large file or garbage.php, used for download test. must be relative to this js file - url_ul: "backend/empty", // path to an empty file, used for upload test. must be relative to this js file - url_ping: "backend/empty", // path to an empty file, used for ping test. must be relative to this js file - url_getIp: "backend/getIP", // path to getIP.php relative to this js file, or a similar thing that outputs the client's ip - getIp_ispInfo: true, //if set to true, the server will include ISP info with the IP address - getIp_ispInfo_distance: "km", //km or mi=estimate distance from server in km/mi; set to false to disable distance estimation. getIp_ispInfo must be enabled in order for this to work - xhr_dlMultistream: 6, // number of download streams to use (can be different if enable_quirks is active) - xhr_ulMultistream: 3, // number of upload streams to use (can be different if enable_quirks is active) - xhr_multistreamDelay: 300, //how much concurrent requests should be delayed - xhr_ignoreErrors: 1, // 0=fail on errors, 1=attempt to restart a stream if it fails, 2=ignore all errors - xhr_dlUseBlob: false, // if set to true, it reduces ram usage but uses the hard drive (useful with large garbagePhp_chunkSize and/or high xhr_dlMultistream) - xhr_ul_blob_megabytes: 20, //size in megabytes of the upload blobs sent in the upload test (forced to 4 on chrome mobile) - garbagePhp_chunkSize: 100, // size of chunks sent by garbage.php (can be different if enable_quirks is active) - enable_quirks: true, // enable quirks for specific browsers. currently it overrides settings to optimize for specific browsers, unless they are already being overridden with the start command - ping_allowPerformanceApi: true, // if enabled, the ping test will attempt to calculate the ping more precisely using the Performance API. Currently works perfectly in Chrome, badly in Edge, and not at all in Firefox. If Performance API is not supported or the result is obviously wrong, a fallback is provided. - overheadCompensationFactor: 1.06, //can be changed to compensatie for transport overhead. (see doc.md for some other values) - useMebibits: false, //if set to true, speed will be reported in Mibit/s instead of Mbit/s - telemetry_level: 0, // 0=disabled, 1=basic (results only), 2=full (results and timing) 3=debug (results+log) - url_telemetry: "results/telemetry", // path to the script that adds telemetry data to the database - telemetry_extra: "" //extra data that can be passed to the telemetry through the settings -}; - -var xhr = null; // array of currently active xhr requests -var interval = null; // timer used in tests -var test_pointer = 0; //pointer to the next test to run inside settings.test_order - -/* - this function is used on URLs passed in the settings to determine whether we need a ? or an & as a separator -*/ -function url_sep(url) { - return url.match(/\?/) ? "&" : "?"; -} - -/* - listener for commands from main thread to this worker. - commands: - -status: returns the current status as a JSON string containing testState, dlStatus, ulStatus, pingStatus, clientIp, jitterStatus, dlProgress, ulProgress, pingProgress - -abort: aborts the current test - -start: starts the test. optionally, settings can be passed as JSON. - example: start {"time_ul_max":"10", "time_dl_max":"10", "count_ping":"50"} -*/ -this.addEventListener("message", function(e) { - var params = e.data.split(" "); - if (params[0] === "status") { - // return status - postMessage( - JSON.stringify({ - testState: testState, - dlStatus: dlStatus, - ulStatus: ulStatus, - pingStatus: pingStatus, - clientIp: clientIp, - jitterStatus: jitterStatus, - dlProgress: dlProgress, - ulProgress: ulProgress, - pingProgress: pingProgress, - testId: testId - }) - ); - } - if (params[0] === "start" && testState === -1) { - // start new test - testState = 0; - try { - // parse settings, if present - var s = {}; - try { - var ss = e.data.substring(5); - if (ss) s = JSON.parse(ss); - } catch (e) { - twarn("Error parsing custom settings JSON. Please check your syntax"); - } - //copy custom settings - for (var key in s) { - if (typeof settings[key] !== "undefined") settings[key] = s[key]; - else twarn("Unknown setting ignored: " + key); - } - var ua = navigator.userAgent; - // quirks for specific browsers. apply only if not overridden. more may be added in future releases - if (settings.enable_quirks || (typeof s.enable_quirks !== "undefined" && s.enable_quirks)) { - if (/Firefox.(\d+\.\d+)/i.test(ua)) { - if (typeof s.ping_allowPerformanceApi === "undefined") { - // ff performance API sucks - settings.ping_allowPerformanceApi = false; - } - } - if (/Edge.(\d+\.\d+)/i.test(ua)) { - if (typeof s.xhr_dlMultistream === "undefined") { - // edge more precise with 3 download streams - settings.xhr_dlMultistream = 3; - } - } - if (/Chrome.(\d+)/i.test(ua) && !!self.fetch) { - if (typeof s.xhr_dlMultistream === "undefined") { - // chrome more precise with 5 streams - settings.xhr_dlMultistream = 5; - } - } - } - if (/Edge.(\d+\.\d+)/i.test(ua)) { - //Edge 15 introduced a bug that causes onprogress events to not get fired, we have to use the "small chunks" workaround that reduces accuracy - settings.forceIE11Workaround = true; - } - if (/PlayStation 4.(\d+\.\d+)/i.test(ua)) { - //PS4 browser has the same bug as IE11/Edge - settings.forceIE11Workaround = true; - } - if (/Chrome.(\d+)/i.test(ua) && /Android|iPhone|iPad|iPod|Windows Phone/i.test(ua)) { - //cheap af - //Chrome mobile introduced a limitation somewhere around version 65, we have to limit XHR upload size to 4 megabytes - settings.xhr_ul_blob_megabytes = 4; - } - if (/^((?!chrome|android|crios|fxios).)*safari/i.test(ua)) { - //Safari also needs the IE11 workaround but only for the MPOT version - settings.forceIE11Workaround = true; - } - //telemetry_level has to be parsed and not just copied - if (typeof s.telemetry_level !== "undefined") settings.telemetry_level = s.telemetry_level === "basic" ? 1 : s.telemetry_level === "full" ? 2 : s.telemetry_level === "debug" ? 3 : 0; // telemetry level - //transform test_order to uppercase, just in case - settings.test_order = settings.test_order.toUpperCase(); - } catch (e) { - twarn("Possible error in custom test settings. Some settings might not have been applied. Exception: " + e); - } - // run the tests - tverb(JSON.stringify(settings)); - test_pointer = 0; - var iRun = false, - dRun = false, - uRun = false, - pRun = false; - var runNextTest = function() { - if (testState == 5) return; - if (test_pointer >= settings.test_order.length) { - //test is finished - if (settings.telemetry_level > 0) - sendTelemetry(function(id) { - testState = 4; - if (id != null) testId = id; - }); - else testState = 4; - return; - } - switch (settings.test_order.charAt(test_pointer)) { - case "I": - { - test_pointer++; - if (iRun) { - runNextTest(); - return; - } else iRun = true; - getIp(runNextTest); - } - break; - case "D": - { - test_pointer++; - if (dRun) { - runNextTest(); - return; - } else dRun = true; - testState = 1; - dlTest(runNextTest); - } - break; - case "U": - { - test_pointer++; - if (uRun) { - runNextTest(); - return; - } else uRun = true; - testState = 3; - ulTest(runNextTest); - } - break; - case "P": - { - test_pointer++; - if (pRun) { - runNextTest(); - return; - } else pRun = true; - testState = 2; - pingTest(runNextTest); - } - break; - case "_": - { - test_pointer++; - setTimeout(runNextTest, 1000); - } - break; - default: - test_pointer++; - } - }; - runNextTest(); - } - if (params[0] === "abort") { - // abort command - if (testState >= 4) return; - tlog("manually aborted"); - clearRequests(); // stop all xhr activity - runNextTest = null; - if (interval) clearInterval(interval); // clear timer if present - if (settings.telemetry_level > 1) sendTelemetry(function() {}); - testState = 5; //set test as aborted - dlStatus = ""; - ulStatus = ""; - pingStatus = ""; - jitterStatus = ""; - clientIp = ""; - dlProgress = 0; - ulProgress = 0; - pingProgress = 0; - } -}); -// stops all XHR activity, aggressively -function clearRequests() { - tverb("stopping pending XHRs"); - if (xhr) { - for (var i = 0; i < xhr.length; i++) { - try { - xhr[i].onprogress = null; - xhr[i].onload = null; - xhr[i].onerror = null; - } catch (e) {} - try { - xhr[i].upload.onprogress = null; - xhr[i].upload.onload = null; - xhr[i].upload.onerror = null; - } catch (e) {} - try { - xhr[i].abort(); - } catch (e) {} - try { - delete xhr[i]; - } catch (e) {} - } - xhr = null; - } -} -// gets client's IP using url_getIp, then calls the done function -var ipCalled = false; // used to prevent multiple accidental calls to getIp -var ispInfo = ""; //used for telemetry -function getIp(done) { - tverb("getIp"); - if (ipCalled) return; - else ipCalled = true; // getIp already called? - var startT = new Date().getTime(); - xhr = new XMLHttpRequest(); - xhr.onload = function() { - tlog("IP: " + xhr.responseText + ", took " + (new Date().getTime() - startT) + "ms"); - try { - var data = JSON.parse(xhr.responseText); - clientIp = data.processedString; - ispInfo = data.rawIspInfo; - } catch (e) { - clientIp = xhr.responseText; - ispInfo = ""; - } - done(); - }; - xhr.onerror = function() { - tlog("getIp failed, took " + (new Date().getTime() - startT) + "ms"); - done(); - }; - xhr.open("GET", settings.url_getIp + url_sep(settings.url_getIp) + (settings.mpot ? "cors=true&" : "") + (settings.getIp_ispInfo ? "isp=true" + (settings.getIp_ispInfo_distance ? "&distance=" + settings.getIp_ispInfo_distance + "&" : "&") : "&") + "r=" + Math.random(), true); - xhr.send(); -} -// download test, calls done function when it's over -var dlCalled = false; // used to prevent multiple accidental calls to dlTest -function dlTest(done) { - tverb("dlTest"); - if (dlCalled) return; - else dlCalled = true; // dlTest already called? - var totLoaded = 0.0, // total number of loaded bytes - startT = new Date().getTime(), // timestamp when test was started - bonusT = 0, //how many milliseconds the test has been shortened by (higher on faster connections) - graceTimeDone = false, //set to true after the grace time is past - failed = false; // set to true if a stream fails - xhr = []; - // function to create a download stream. streams are slightly delayed so that they will not end at the same time - var testStream = function(i, delay) { - setTimeout( - function() { - if (testState !== 1) return; // delayed stream ended up starting after the end of the download test - tverb("dl test stream started " + i + " " + delay); - var prevLoaded = 0; // number of bytes loaded last time onprogress was called - var x = new XMLHttpRequest(); - xhr[i] = x; - xhr[i].onprogress = function(event) { - tverb("dl stream progress event " + i + " " + event.loaded); - if (testState !== 1) { - try { - x.abort(); - } catch (e) {} - } // just in case this XHR is still running after the download test - // progress event, add number of new loaded bytes to totLoaded - var loadDiff = event.loaded <= 0 ? 0 : event.loaded - prevLoaded; - if (isNaN(loadDiff) || !isFinite(loadDiff) || loadDiff < 0) return; // just in case - totLoaded += loadDiff; - prevLoaded = event.loaded; - }.bind(this); - xhr[i].onload = function() { - // the large file has been loaded entirely, start again - tverb("dl stream finished " + i); - try { - xhr[i].abort(); - } catch (e) {} // reset the stream data to empty ram - testStream(i, 0); - }.bind(this); - xhr[i].onerror = function() { - // error - tverb("dl stream failed " + i); - if (settings.xhr_ignoreErrors === 0) failed = true; //abort - try { - xhr[i].abort(); - } catch (e) {} - delete xhr[i]; - if (settings.xhr_ignoreErrors === 1) testStream(i, 0); //restart stream - }.bind(this); - // send xhr - try { - if (settings.xhr_dlUseBlob) xhr[i].responseType = "blob"; - else xhr[i].responseType = "arraybuffer"; - } catch (e) {} - xhr[i].open("GET", settings.url_dl + url_sep(settings.url_dl) + (settings.mpot ? "cors=true&" : "") + "r=" + Math.random() + "&ckSize=" + settings.garbagePhp_chunkSize, true); // random string to prevent caching - xhr[i].send(); - }.bind(this), - 1 + delay - ); - }.bind(this); - // open streams - for (var i = 0; i < settings.xhr_dlMultistream; i++) { - testStream(i, settings.xhr_multistreamDelay * i); - } - // every 200ms, update dlStatus - interval = setInterval( - function() { - tverb("DL: " + dlStatus + (graceTimeDone ? "" : " (in grace time)")); - var t = new Date().getTime() - startT; - if (graceTimeDone) dlProgress = (t + bonusT) / (settings.time_dl_max * 1000); - if (t < 200) return; - if (!graceTimeDone) { - if (t > 1000 * settings.time_dlGraceTime) { - if (totLoaded > 0) { - // if the connection is so slow that we didn't get a single chunk yet, do not reset - startT = new Date().getTime(); - bonusT = 0; - totLoaded = 0.0; - } - graceTimeDone = true; - } - } else { - var speed = totLoaded / (t / 1000.0); - if (settings.time_auto) { - //decide how much to shorten the test. Every 200ms, the test is shortened by the bonusT calculated here - var bonus = (6.4 * speed) / 100000; - bonusT += bonus > 800 ? 800 : bonus; - } - //update status - dlStatus = ((speed * 8 * settings.overheadCompensationFactor) / (settings.useMebibits ? 1048576 : 1000000)).toFixed(2); // speed is multiplied by 8 to go from bytes to bits, overhead compensation is applied, then everything is divided by 1048576 or 1000000 to go to megabits/mebibits - if ((t + bonusT) / 1000.0 > settings.time_dl_max || failed) { - // test is over, stop streams and timer - if (failed || isNaN(dlStatus)) dlStatus = "Fail"; - clearRequests(); - clearInterval(interval); - dlProgress = 1; - tlog("dlTest: " + dlStatus + ", took " + (new Date().getTime() - startT) + "ms"); - done(); - } - } - }.bind(this), - 200 - ); -} -// upload test, calls done function whent it's over -var ulCalled = false; // used to prevent multiple accidental calls to ulTest -function ulTest(done) { - tverb("ulTest"); - if (ulCalled) return; - else ulCalled = true; // ulTest already called? - // garbage data for upload test - var r = new ArrayBuffer(1048576); - var maxInt = Math.pow(2, 32) - 1; - try { - r = new Uint32Array(r); - for (var i = 0; i < r.length; i++) r[i] = Math.random() * maxInt; - } catch (e) {} - var req = []; - var reqsmall = []; - for (var i = 0; i < settings.xhr_ul_blob_megabytes; i++) req.push(r); - req = new Blob(req); - r = new ArrayBuffer(262144); - try { - r = new Uint32Array(r); - for (var i = 0; i < r.length; i++) r[i] = Math.random() * maxInt; - } catch (e) {} - reqsmall.push(r); - reqsmall = new Blob(reqsmall); - var testFunction = function() { - var totLoaded = 0.0, // total number of transmitted bytes - startT = new Date().getTime(), // timestamp when test was started - bonusT = 0, //how many milliseconds the test has been shortened by (higher on faster connections) - graceTimeDone = false, //set to true after the grace time is past - failed = false; // set to true if a stream fails - xhr = []; - // function to create an upload stream. streams are slightly delayed so that they will not end at the same time - var testStream = function(i, delay) { - setTimeout( - function() { - if (testState !== 3) return; // delayed stream ended up starting after the end of the upload test - tverb("ul test stream started " + i + " " + delay); - var prevLoaded = 0; // number of bytes transmitted last time onprogress was called - var x = new XMLHttpRequest(); - xhr[i] = x; - var ie11workaround; - if (settings.forceIE11Workaround) ie11workaround = true; - else { - try { - xhr[i].upload.onprogress; - ie11workaround = false; - } catch (e) { - ie11workaround = true; - } - } - if (ie11workaround) { - // IE11 workarond: xhr.upload does not work properly, therefore we send a bunch of small 256k requests and use the onload event as progress. This is not precise, especially on fast connections - xhr[i].onload = xhr[i].onerror = function() { - tverb("ul stream progress event (ie11wa)"); - totLoaded += reqsmall.size; - testStream(i, 0); - }; - xhr[i].open("POST", settings.url_ul + url_sep(settings.url_ul) + (settings.mpot ? "cors=true&" : "") + "r=" + Math.random(), true); // random string to prevent caching - try { - xhr[i].setRequestHeader("Content-Encoding", "identity"); // disable compression (some browsers may refuse it, but data is incompressible anyway) - } catch (e) {} - //No Content-Type header in MPOT branch because it triggers bugs in some browsers - xhr[i].send(reqsmall); - } else { - // REGULAR version, no workaround - xhr[i].upload.onprogress = function(event) { - tverb("ul stream progress event " + i + " " + event.loaded); - if (testState !== 3) { - try { - x.abort(); - } catch (e) {} - } // just in case this XHR is still running after the upload test - // progress event, add number of new loaded bytes to totLoaded - var loadDiff = event.loaded <= 0 ? 0 : event.loaded - prevLoaded; - if (isNaN(loadDiff) || !isFinite(loadDiff) || loadDiff < 0) return; // just in case - totLoaded += loadDiff; - prevLoaded = event.loaded; - }.bind(this); - xhr[i].upload.onload = function() { - // this stream sent all the garbage data, start again - tverb("ul stream finished " + i); - testStream(i, 0); - }.bind(this); - xhr[i].upload.onerror = function() { - tverb("ul stream failed " + i); - if (settings.xhr_ignoreErrors === 0) failed = true; //abort - try { - xhr[i].abort(); - } catch (e) {} - delete xhr[i]; - if (settings.xhr_ignoreErrors === 1) testStream(i, 0); //restart stream - }.bind(this); - // send xhr - xhr[i].open("POST", settings.url_ul + url_sep(settings.url_ul) + (settings.mpot ? "cors=true&" : "") + "r=" + Math.random(), true); // random string to prevent caching - try { - xhr[i].setRequestHeader("Content-Encoding", "identity"); // disable compression (some browsers may refuse it, but data is incompressible anyway) - } catch (e) {} - //No Content-Type header in MPOT branch because it triggers bugs in some browsers - xhr[i].send(req); - } - }.bind(this), - delay - ); - }.bind(this); - // open streams - for (var i = 0; i < settings.xhr_ulMultistream; i++) { - testStream(i, settings.xhr_multistreamDelay * i); - } - // every 200ms, update ulStatus - interval = setInterval( - function() { - tverb("UL: " + ulStatus + (graceTimeDone ? "" : " (in grace time)")); - var t = new Date().getTime() - startT; - if (graceTimeDone) ulProgress = (t + bonusT) / (settings.time_ul_max * 1000); - if (t < 200) return; - if (!graceTimeDone) { - if (t > 1000 * settings.time_ulGraceTime) { - if (totLoaded > 0) { - // if the connection is so slow that we didn't get a single chunk yet, do not reset - startT = new Date().getTime(); - bonusT = 0; - totLoaded = 0.0; - } - graceTimeDone = true; - } - } else { - var speed = totLoaded / (t / 1000.0); - if (settings.time_auto) { - //decide how much to shorten the test. Every 200ms, the test is shortened by the bonusT calculated here - var bonus = (6.4 * speed) / 100000; - bonusT += bonus > 800 ? 800 : bonus; - } - //update status - ulStatus = ((speed * 8 * settings.overheadCompensationFactor) / (settings.useMebibits ? 1048576 : 1000000)).toFixed(2); // speed is multiplied by 8 to go from bytes to bits, overhead compensation is applied, then everything is divided by 1048576 or 1000000 to go to megabits/mebibits - if ((t + bonusT) / 1000.0 > settings.time_ul_max || failed) { - // test is over, stop streams and timer - if (failed || isNaN(ulStatus)) ulStatus = "Fail"; - clearRequests(); - clearInterval(interval); - ulProgress = 1; - tlog("ulTest: " + ulStatus + ", took " + (new Date().getTime() - startT) + "ms"); - done(); - } - } - }.bind(this), - 200 - ); - }.bind(this); - if (settings.mpot) { - tverb("Sending POST request before performing upload test"); - xhr = []; - xhr[0] = new XMLHttpRequest(); - xhr[0].onload = xhr[0].onerror = function() { - tverb("POST request sent, starting upload test"); - testFunction(); - }.bind(this); - xhr[0].open("POST", settings.url_ul); - xhr[0].send(); - } else testFunction(); -} -// ping+jitter test, function done is called when it's over -var ptCalled = false; // used to prevent multiple accidental calls to pingTest -function pingTest(done) { - tverb("pingTest"); - if (ptCalled) return; - else ptCalled = true; // pingTest already called? - var startT = new Date().getTime(); //when the test was started - var prevT = null; // last time a pong was received - var ping = 0.0; // current ping value - var jitter = 0.0; // current jitter value - var i = 0; // counter of pongs received - var prevInstspd = 0; // last ping time, used for jitter calculation - xhr = []; - // ping function - var doPing = function() { - tverb("ping"); - pingProgress = i / settings.count_ping; - prevT = new Date().getTime(); - xhr[0] = new XMLHttpRequest(); - xhr[0].onload = function() { - // pong - tverb("pong"); - if (i === 0) { - prevT = new Date().getTime(); // first pong - } else { - var instspd = new Date().getTime() - prevT; - if (settings.ping_allowPerformanceApi) { - try { - //try to get accurate performance timing using performance api - var p = performance.getEntries(); - p = p[p.length - 1]; - var d = p.responseStart - p.requestStart; - if (d <= 0) d = p.duration; - if (d > 0 && d < instspd) instspd = d; - } catch (e) { - //if not possible, keep the estimate - tverb("Performance API not supported, using estimate"); - } - } - //noticed that some browsers randomly have 0ms ping - if (instspd < 1) instspd = prevInstspd; - if (instspd < 1) instspd = 1; - var instjitter = Math.abs(instspd - prevInstspd); - if (i === 1) ping = instspd; - /* first ping, can't tell jitter yet*/ else { - if (instspd < ping) ping = instspd; // update ping, if the instant ping is lower - if (i === 2) jitter = instjitter; - //discard the first jitter measurement because it might be much higher than it should be - else jitter = instjitter > jitter ? jitter * 0.3 + instjitter * 0.7 : jitter * 0.8 + instjitter * 0.2; // update jitter, weighted average. spikes in ping values are given more weight. - } - prevInstspd = instspd; - } - pingStatus = ping.toFixed(2); - jitterStatus = jitter.toFixed(2); - i++; - tverb("ping: " + pingStatus + " jitter: " + jitterStatus); - if (i < settings.count_ping) doPing(); - else { - // more pings to do? - pingProgress = 1; - tlog("ping: " + pingStatus + " jitter: " + jitterStatus + ", took " + (new Date().getTime() - startT) + "ms"); - done(); - } - }.bind(this); - xhr[0].onerror = function() { - // a ping failed, cancel test - tverb("ping failed"); - if (settings.xhr_ignoreErrors === 0) { - //abort - pingStatus = "Fail"; - jitterStatus = "Fail"; - clearRequests(); - tlog("ping test failed, took " + (new Date().getTime() - startT) + "ms"); - pingProgress = 1; - done(); - } - if (settings.xhr_ignoreErrors === 1) doPing(); //retry ping - if (settings.xhr_ignoreErrors === 2) { - //ignore failed ping - i++; - if (i < settings.count_ping) doPing(); - else { - // more pings to do? - pingProgress = 1; - tlog("ping: " + pingStatus + " jitter: " + jitterStatus + ", took " + (new Date().getTime() - startT) + "ms"); - done(); - } - } - }.bind(this); - // send xhr - xhr[0].open("GET", settings.url_ping + url_sep(settings.url_ping) + (settings.mpot ? "cors=true&" : "") + "r=" + Math.random(), true); // random string to prevent caching - xhr[0].send(); - }.bind(this); - doPing(); // start first ping -} -// telemetry -function sendTelemetry(done) { - if (settings.telemetry_level < 1) return; - xhr = new XMLHttpRequest(); - xhr.onload = function() { - try { - var parts = xhr.responseText.split(" "); - if (parts[0] == "id") { - try { - var id = parts[1]; - done(id); - } catch (e) { - done(null); - } - } else done(null); - } catch (e) { - done(null); - } - }; - xhr.onerror = function() { - console.log("TELEMETRY ERROR " + xhr.status); - done(null); - }; - xhr.open("POST", settings.url_telemetry + url_sep(settings.url_telemetry) + (settings.mpot ? "cors=true&" : "") + "r=" + Math.random(), true); - var telemetryIspInfo = { - processedString: clientIp, - rawIspInfo: typeof ispInfo === "object" ? ispInfo : "" - }; - try { - var fd = new FormData(); - fd.append("ispinfo", JSON.stringify(telemetryIspInfo)); - fd.append("dl", dlStatus); - fd.append("ul", ulStatus); - fd.append("ping", pingStatus); - fd.append("jitter", jitterStatus); - fd.append("log", settings.telemetry_level > 1 ? log : ""); - fd.append("extra", settings.telemetry_extra); - xhr.send(fd); - } catch (ex) { - var postData = "extra=" + encodeURIComponent(settings.telemetry_extra) + "&ispinfo=" + encodeURIComponent(JSON.stringify(telemetryIspInfo)) + "&dl=" + encodeURIComponent(dlStatus) + "&ul=" + encodeURIComponent(ulStatus) + "&ping=" + encodeURIComponent(pingStatus) + "&jitter=" + encodeURIComponent(jitterStatus) + "&log=" + encodeURIComponent(settings.telemetry_level > 1 ? log : ""); - xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); - xhr.send(postData); - } -} diff --git a/config/config.go b/config/config.go deleted file mode 100644 index babcbb7..0000000 --- a/config/config.go +++ /dev/null @@ -1,71 +0,0 @@ -package config - -import ( - log "github.com/sirupsen/logrus" - "github.com/spf13/viper" -) - -type Config struct { - BindAddress string `mapstructure:"bind_address"` - Port string `mapstructure:"listen_port"` - ServerLat float64 `mapstructure:"server_lat"` - ServerLng float64 `mapstructure:"server_lng"` - IPInfoAPIKey string `mapstructure:"ipinfo_api_key"` - - StatsPassword string `mapstructure:"statistics_password"` - RedactIP bool `mapstructure:"redact_ip_addresses"` - - DatabaseType string `mapstructure:"database_type"` - DatabaseHostname string `mapstructure:"database_hostname"` - DatabaseName string `mapstructure:"database_name"` - DatabaseUsername string `mapstructure:"database_username"` - DatabasePassword string `mapstructure:"database_password"` - - DatabaseFile string `mapstructure:"database_file"` -} - -var ( - loadedConfig *Config = nil -) - -func init() { - viper.SetDefault("listen_port", "8989") - viper.SetDefault("download_chunks", 4) - viper.SetDefault("distance_unit", "K") - viper.SetDefault("enable_cors", false) - viper.SetDefault("statistics_password", "PASSWORD") - viper.SetDefault("redact_ip_addresses", false) - viper.SetDefault("database_type", "postgresql") - viper.SetDefault("database_hostname", "localhost") - viper.SetDefault("database_name", "speedtest") - viper.SetDefault("database_username", "postgres") - - viper.SetConfigName("settings") - viper.AddConfigPath(".") -} - -func Load() Config { - var conf Config - if err := viper.ReadInConfig(); err != nil { - if _, ok := err.(viper.ConfigFileNotFoundError); ok { - log.Warnf("No config file found in search paths, using default values") - } else { - log.Fatalf("Error reading config: %+v", err) - } - } - - if err := viper.Unmarshal(&conf); err != nil { - log.Fatalf("Error parsing config: %s", err) - } - - loadedConfig = &conf - - return conf -} - -func LoadedConfig() *Config { - if loadedConfig == nil { - Load() - } - return loadedConfig -} diff --git a/database/bolt/bolt.go b/database/bolt/bolt.go deleted file mode 100644 index f61e43c..0000000 --- a/database/bolt/bolt.go +++ /dev/null @@ -1,84 +0,0 @@ -package bolt - -import ( - "encoding/json" - "errors" - "time" - - "go.etcd.io/bbolt" - - "github.com/librespeed/speedtest/database/schema" - - _ "github.com/go-sql-driver/mysql" - log "github.com/sirupsen/logrus" -) - -const ( - bucketName = `speedtest` -) - -type Bolt struct { - db *bbolt.DB -} - -func Open(databaseFile string) *Bolt { - db, err := bbolt.Open(databaseFile, 0666, nil) - if err != nil { - log.Fatalf("Cannot open BoltDB database file: %s", err) - } - return &Bolt{db: db} -} - -func (p *Bolt) Insert(data *schema.TelemetryData) error { - return p.db.Update(func(tx *bbolt.Tx) error { - data.Timestamp = time.Now() - b, _ := json.Marshal(data) - bucket, err := tx.CreateBucketIfNotExists([]byte(bucketName)) - if err != nil { - return err - } - return bucket.Put([]byte(data.UUID), b) - }) -} - -func (p *Bolt) FetchByUUID(uuid string) (*schema.TelemetryData, error) { - var record schema.TelemetryData - err := p.db.View(func(tx *bbolt.Tx) error { - bucket := tx.Bucket([]byte(bucketName)) - if bucket == nil { - return errors.New("data bucket doesn't exist yet") - } - b := bucket.Get([]byte(uuid)) - return json.Unmarshal(b, &record) - }) - return &record, err -} - -func (p *Bolt) FetchLast100() ([]schema.TelemetryData, error) { - var records []schema.TelemetryData - err := p.db.View(func(tx *bbolt.Tx) error { - var record schema.TelemetryData - bucket := tx.Bucket([]byte(bucketName)) - if bucket == nil { - return errors.New("data bucket doesn't exist yet") - } - - cursor := bucket.Cursor() - _, b := cursor.Last() - - for len(records) < 100 { - if err := json.Unmarshal(b, &record); err != nil { - return err - } - records = append(records, record) - - _, b = cursor.Prev() - if b == nil { - break - } - } - - return nil - }) - return records, err -} diff --git a/database/database.go b/database/database.go deleted file mode 100644 index 8581127..0000000 --- a/database/database.go +++ /dev/null @@ -1,30 +0,0 @@ -package database - -import ( - "github.com/librespeed/speedtest/config" - "github.com/librespeed/speedtest/database/bolt" - "github.com/librespeed/speedtest/database/mysql" - "github.com/librespeed/speedtest/database/postgresql" - "github.com/librespeed/speedtest/database/schema" -) - -var ( - DB DataAccess -) - -type DataAccess interface { - Insert(*schema.TelemetryData) error - FetchByUUID(string) (*schema.TelemetryData, error) - FetchLast100() ([]schema.TelemetryData, error) -} - -func SetDBInfo(conf *config.Config) { - switch conf.DatabaseType { - case "postgresql": - DB = postgresql.Open(conf.DatabaseHostname, conf.DatabaseUsername, conf.DatabasePassword, conf.DatabaseName) - case "mysql": - DB = mysql.Open(conf.DatabaseHostname, conf.DatabaseUsername, conf.DatabasePassword, conf.DatabaseName) - case "bolt": - DB = bolt.Open(conf.DatabaseFile) - } -} diff --git a/database/mysql/mysql.go b/database/mysql/mysql.go deleted file mode 100644 index 33a7462..0000000 --- a/database/mysql/mysql.go +++ /dev/null @@ -1,66 +0,0 @@ -package mysql - -import ( - "database/sql" - "fmt" - - "github.com/librespeed/speedtest/database/schema" - - _ "github.com/go-sql-driver/mysql" - log "github.com/sirupsen/logrus" -) - -const ( - connectionStringTemplate = `%s:%s@%s/%s` -) - -type MySQL struct { - db *sql.DB -} - -func Open(hostname, username, password, database string) *MySQL { - connStr := fmt.Sprintf(connectionStringTemplate, username, password, hostname, database) - conn, err := sql.Open("mysql", connStr) - if err != nil { - log.Fatalf("Cannot open MySQL database: %s", err) - } - return &MySQL{db: conn} -} - -func (p *MySQL) Insert(data *schema.TelemetryData) error { - stmt := `INSERT INTO speedtest_users (ip, ispinfo, extra, ua, lang, dl, ul, ping, jitter, log, uuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);` - _, err := p.db.Exec(stmt, data.IPAddress, data.ISPInfo, data.Extra, data.UserAgent, data.Language, data.Download, data.Upload, data.Ping, data.Jitter, data.Log, data.UUID) - return err -} - -func (p *MySQL) FetchByUUID(uuid string) (*schema.TelemetryData, error) { - var record schema.TelemetryData - row := p.db.QueryRow(`SELECT * FROM speedtest_users WHERE uuid = ?`, uuid) - if row != nil { - var id string - if err := row.Scan(&id, &record.Timestamp, &record.IPAddress, &record.ISPInfo, &record.Extra, &record.UserAgent, &record.Language, &record.Download, &record.Upload, &record.Ping, &record.Jitter, &record.Log, &record.UUID); err != nil { - return nil, err - } - } - return &record, nil -} - -func (p *MySQL) FetchLast100() ([]schema.TelemetryData, error) { - var records []schema.TelemetryData - rows, err := p.db.Query(`SELECT * FROM speedtest_users ORDER BY "timestamp" DESC LIMIT 100;`) - if err != nil { - return nil, err - } - if rows != nil { - var id string - - for rows.Next() { - var record schema.TelemetryData - if err := rows.Scan(&id, &record.Timestamp, &record.IPAddress, &record.ISPInfo, &record.Extra, &record.UserAgent, &record.Language, &record.Download, &record.Upload, &record.Ping, &record.Jitter, &record.Log, &record.UUID); err != nil { - return nil, err - } - records = append(records, record) - } - } - return records, nil -} diff --git a/database/mysql/telemetry_mysql.sql b/database/mysql/telemetry_mysql.sql deleted file mode 100644 index 1f33002..0000000 --- a/database/mysql/telemetry_mysql.sql +++ /dev/null @@ -1,60 +0,0 @@ -SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; -SET AUTOCOMMIT = 0; -START TRANSACTION; -SET time_zone = "+00:00"; - - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8mb4 */; - --- --- Database: `speedtest_telemetry` --- - --- -------------------------------------------------------- - --- --- Table structure for table `speedtest_users` --- - -CREATE TABLE `speedtest_users` ( - `id` int(11) NOT NULL, - `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `ip` text NOT NULL, - `ispinfo` text, - `extra` text, - `ua` text NOT NULL, - `lang` text NOT NULL, - `dl` text, - `ul` text, - `ping` text, - `jitter` text, - `log` longtext, - `uuid` text -) ENGINE=InnoDB DEFAULT CHARSET=latin1; - --- --- Indexes for dumped tables --- - --- --- Indexes for table `speedtest_users` --- -ALTER TABLE `speedtest_users` - ADD PRIMARY KEY (`id`); - --- --- AUTO_INCREMENT for dumped tables --- - --- --- AUTO_INCREMENT for table `speedtest_users` --- -ALTER TABLE `speedtest_users` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;COMMIT; - -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; diff --git a/database/postgresql/postgresql.go b/database/postgresql/postgresql.go deleted file mode 100644 index 74ada87..0000000 --- a/database/postgresql/postgresql.go +++ /dev/null @@ -1,66 +0,0 @@ -package postgresql - -import ( - "database/sql" - "fmt" - - "github.com/librespeed/speedtest/database/schema" - - _ "github.com/lib/pq" - log "github.com/sirupsen/logrus" -) - -const ( - connectionStringTemplate = `postgres://%s:%s@%s/%s?sslmode=disable` -) - -type PostgreSQL struct { - db *sql.DB -} - -func Open(hostname, username, password, database string) *PostgreSQL { - connStr := fmt.Sprintf(connectionStringTemplate, username, password, hostname, database) - conn, err := sql.Open("postgres", connStr) - if err != nil { - log.Fatalf("Cannot open PostgreSQL database: %s", err) - } - return &PostgreSQL{db: conn} -} - -func (p *PostgreSQL) Insert(data *schema.TelemetryData) error { - stmt := `INSERT INTO speedtest_users (ip, ispinfo, extra, ua, lang, dl, ul, ping, jitter, log, uuid) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) RETURNING id;` - _, err := p.db.Exec(stmt, data.IPAddress, data.ISPInfo, data.Extra, data.UserAgent, data.Language, data.Download, data.Upload, data.Ping, data.Jitter, data.Log, data.UUID) - return err -} - -func (p *PostgreSQL) FetchByUUID(uuid string) (*schema.TelemetryData, error) { - var record schema.TelemetryData - row := p.db.QueryRow(`SELECT * FROM speedtest_users WHERE uuid = $1`, uuid) - if row != nil { - var id string - if err := row.Scan(&id, &record.Timestamp, &record.IPAddress, &record.ISPInfo, &record.Extra, &record.UserAgent, &record.Language, &record.Download, &record.Upload, &record.Ping, &record.Jitter, &record.Log, &record.UUID); err != nil { - return nil, err - } - } - return &record, nil -} - -func (p *PostgreSQL) FetchLast100() ([]schema.TelemetryData, error) { - var records []schema.TelemetryData - rows, err := p.db.Query(`SELECT * FROM speedtest_users ORDER BY "timestamp" DESC LIMIT 100;`) - if err != nil { - return nil, err - } - if rows != nil { - var id string - - for rows.Next() { - var record schema.TelemetryData - if err := rows.Scan(&id, &record.Timestamp, &record.IPAddress, &record.ISPInfo, &record.Extra, &record.UserAgent, &record.Language, &record.Download, &record.Upload, &record.Ping, &record.Jitter, &record.Log, &record.UUID); err != nil { - return nil, err - } - records = append(records, record) - } - } - return records, nil -} diff --git a/database/postgresql/telemetry_postgresql.sql b/database/postgresql/telemetry_postgresql.sql deleted file mode 100644 index f0ba8f7..0000000 --- a/database/postgresql/telemetry_postgresql.sql +++ /dev/null @@ -1,114 +0,0 @@ --- --- PostgreSQL database dump --- - --- Dumped from database version 9.6.3 --- Dumped by pg_dump version 9.6.5 - -SET statement_timeout = 0; -SET lock_timeout = 0; -SET idle_in_transaction_session_timeout = 0; -SET client_encoding = 'UTF8'; -SET standard_conforming_strings = on; -SET check_function_bodies = false; -SET client_min_messages = warning; -SET row_security = off; - --- --- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: --- - -CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog; - - --- --- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: --- - -COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language'; - - -SET search_path = public, pg_catalog; - -SET default_tablespace = ''; - -SET default_with_oids = false; - --- --- Name: speedtest_users; Type: TABLE; Schema: public; Owner: speedtest --- - -CREATE TABLE speedtest_users ( - id integer NOT NULL, - "timestamp" timestamp without time zone DEFAULT now() NOT NULL, - ip text NOT NULL, - ispinfo text, - extra text, - ua text NOT NULL, - lang text NOT NULL, - dl text, - ul text, - ping text, - jitter text, - log text, - uuid text -); - --- Commented out the following line because it assumes the user of the speedtest server, @bplower --- ALTER TABLE speedtest_users OWNER TO speedtest; - --- --- Name: speedtest_users_id_seq; Type: SEQUENCE; Schema: public; Owner: speedtest --- - -CREATE SEQUENCE speedtest_users_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - --- Commented out the following line because it assumes the user of the speedtest server, @bplower --- ALTER TABLE speedtest_users_id_seq OWNER TO speedtest; - --- --- Name: speedtest_users_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: speedtest --- - -ALTER SEQUENCE speedtest_users_id_seq OWNED BY speedtest_users.id; - - --- --- Name: speedtest_users id; Type: DEFAULT; Schema: public; Owner: speedtest --- - -ALTER TABLE ONLY speedtest_users ALTER COLUMN id SET DEFAULT nextval('speedtest_users_id_seq'::regclass); - - --- --- Data for Name: speedtest_users; Type: TABLE DATA; Schema: public; Owner: speedtest --- - -COPY speedtest_users (id, "timestamp", ip, ua, lang, dl, ul, ping, jitter, log, uuid) FROM stdin; -\. - - --- --- Name: speedtest_users_id_seq; Type: SEQUENCE SET; Schema: public; Owner: speedtest --- - -SELECT pg_catalog.setval('speedtest_users_id_seq', 1, true); - - --- --- Name: speedtest_users speedtest_users_pkey; Type: CONSTRAINT; Schema: public; Owner: speedtest --- - -ALTER TABLE ONLY speedtest_users - ADD CONSTRAINT speedtest_users_pkey PRIMARY KEY (id); - - --- --- PostgreSQL database dump complete --- - diff --git a/database/schema/schema.go b/database/schema/schema.go deleted file mode 100644 index b6ca208..0000000 --- a/database/schema/schema.go +++ /dev/null @@ -1,20 +0,0 @@ -package schema - -import ( - "time" -) - -type TelemetryData struct { - Timestamp time.Time - IPAddress string - ISPInfo string - Extra string - UserAgent string - Language string - Download string - Upload string - Ping string - Jitter string - Log string - UUID string -} diff --git a/go.mod b/go.mod deleted file mode 100644 index 2491bf2..0000000 --- a/go.mod +++ /dev/null @@ -1,17 +0,0 @@ -module github.com/librespeed/speedtest - -go 1.13 - -require ( - github.com/go-chi/chi v4.0.3+incompatible - github.com/go-chi/cors v1.0.0 - github.com/go-chi/render v1.0.1 - github.com/go-sql-driver/mysql v1.5.0 - github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 - github.com/lib/pq v1.3.0 - github.com/oklog/ulid/v2 v2.0.2 - github.com/sirupsen/logrus v1.4.2 - github.com/spf13/viper v1.6.2 - go.etcd.io/bbolt v1.3.3 - golang.org/x/image v0.0.0-20200119044424-58c23975cae1 -) diff --git a/go.sum b/go.sum deleted file mode 100644 index 76c8d53..0000000 --- a/go.sum +++ /dev/null @@ -1,177 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-chi/chi v4.0.3+incompatible h1:gakN3pDJnzZN5jqFV2TEdF66rTfKeITyR8qu6ekICEY= -github.com/go-chi/chi v4.0.3+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= -github.com/go-chi/cors v1.0.0 h1:e6x8k7uWbUwYs+aXDoiUzeQFT6l0cygBYyNhD7/1Tg0= -github.com/go-chi/cors v1.0.0/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I= -github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8= -github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= -github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU= -github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/oklog/ulid/v2 v2.0.2 h1:r4fFzBm+bv0wNKNh5eXTwU7i85y5x+uwkxCUTNVQqLc= -github.com/oklog/ulid/v2 v2.0.2/go.mod h1:mtBL0Qe/0HAx6/a4Z30qxVIAL1eQDweXq5lxOEiwQ68= -github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= -github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/viper v1.6.2 h1:7aKfF+e8/k68gda3LOjo5RxiUqddoFxVq4BKBPrxk5E= -github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -go.etcd.io/bbolt v1.3.2 h1:Z/90sZLPOeCy2PwprqkFa25PdkusRzaj9P8zm/KNyvk= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/image v0.0.0-20200119044424-58c23975cae1 h1:5h3ngYt7+vXCDZCup/HkCQgW5XwmSvR/nA2JmJ0RErg= -golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/main.go b/main.go deleted file mode 100644 index 9137af1..0000000 --- a/main.go +++ /dev/null @@ -1,16 +0,0 @@ -package main - -import ( - "github.com/librespeed/speedtest/config" - "github.com/librespeed/speedtest/database" - "github.com/librespeed/speedtest/web" - - log "github.com/sirupsen/logrus" -) - -func main() { - conf := config.Load() - - database.SetDBInfo(&conf) - log.Fatal(web.ListenAndServe(&conf)) -} diff --git a/results/stats.go b/results/stats.go deleted file mode 100644 index c8c172a..0000000 --- a/results/stats.go +++ /dev/null @@ -1,178 +0,0 @@ -package results - -import ( - "html/template" - "net/http" - - log "github.com/sirupsen/logrus" - - "github.com/librespeed/speedtest/config" - "github.com/librespeed/speedtest/database" - "github.com/librespeed/speedtest/database/schema" -) - -type StatsData struct { - NoPassword bool - LoggedIn bool - Data []schema.TelemetryData -} - -func Stats(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Content-Type", "text/html; charset=utf-8") - t, err := template.New("template").Parse(htmlTemplate) - if err != nil { - log.Errorf("Failed to parse template: %s", err) - w.WriteHeader(http.StatusInternalServerError) - return - } - - conf := config.LoadedConfig() - var data StatsData - - if conf.StatsPassword == "PASSWORD" { - data.NoPassword = true - } - - if !data.NoPassword { - op := r.FormValue("op") - c, _ := r.Cookie("logged") - - if c != nil && c.Value == "true" { - if op == "logout" { - cookie := &http.Cookie{ - Name: "logged", - Value: "false", - } - http.SetCookie(w, cookie) - http.Redirect(w, r, "/stats", http.StatusTemporaryRedirect) - } else { - data.LoggedIn = true - - id := r.FormValue("id") - switch id { - case "L100": - stats, err := database.DB.FetchLast100() - if err != nil { - log.Errorf("Error fetching data from database: %s", err) - w.WriteHeader(http.StatusInternalServerError) - return - } - data.Data = stats - case "": - default: - stat, err := database.DB.FetchByUUID(id) - if err != nil { - log.Errorf("Error fetching data from database: %s", err) - w.WriteHeader(http.StatusInternalServerError) - return - } - data.Data = append(data.Data, *stat) - } - } - } else { - if op == "login" { - password := r.FormValue("password") - if password == conf.StatsPassword { - cookie := &http.Cookie{ - Name: "logged", - Value: "true", - } - http.SetCookie(w, cookie) - http.Redirect(w, r, "/stats", http.StatusTemporaryRedirect) - } else { - w.WriteHeader(http.StatusForbidden) - } - } - } - } - - if err := t.Execute(w, data); err != nil { - log.Errorf("Error executing template: %s", err) - w.WriteHeader(http.StatusInternalServerError) - } -} - -const htmlTemplate = ` - - -LibreSpeed - Stats - - - -

LibreSpeed - Stats

-{{ if .NoPassword }} - Please set statistics_password in settings.toml to enable access. -{{ else if .LoggedIn }} -
-
-

Search test results

- - - - -
- - {{ range $i, $v := .Data }} - - - - - - - - - - - -
Test ID{{ $v.UUID }}
Date and time{{ $v.Timestamp }}
IP and ISP Info{{ $v.IPAddress }}
{{ $v.ISPInfo }}
User agent and locale{{ $v.UserAgent }}
{{ $v.Language }}
Download speed{{ $v.Download }}
Upload speed{{ $v.Upload }}
Ping{{ $v.Ping }}
Jitter{{ $v.Jitter }}
Log{{ $v.Log }}
Extra info{{ $v.Extra }}
- {{ end }} -{{ else }} -
-

Login

- - -
-{{ end }} - -` diff --git a/results/telemetry.go b/results/telemetry.go deleted file mode 100644 index 1492170..0000000 --- a/results/telemetry.go +++ /dev/null @@ -1,340 +0,0 @@ -package results - -import ( - "encoding/json" - "image" - "image/color" - "image/draw" - "image/png" - "io/ioutil" - "math/rand" - "net" - "net/http" - "regexp" - "strings" - "time" - - "github.com/librespeed/speedtest/config" - "github.com/librespeed/speedtest/database" - "github.com/librespeed/speedtest/database/schema" - - "github.com/golang/freetype" - "github.com/golang/freetype/truetype" - "github.com/oklog/ulid/v2" - log "github.com/sirupsen/logrus" - "golang.org/x/image/font" -) - -const ( - watermark = "LibreSpeed" - - labelMS = " ms" - labelMbps = "Mbit/s" - labelPing = "Ping" - labelJitter = "Jitter" - labelDownload = "Download" - labelUpload = "Upload" -) - -var ( - ipv4Regex = regexp.MustCompile(`(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)`) - ipv6Regex = regexp.MustCompile(`(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4})?:)?((25[0-5]|(2[0-4]|1?[0-9])?[0-9])\.){3}(25[0-5]|(2[0-4]|1?[0-9])?[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1?[0-9])?[0-9])\.){3}(25[0-5]|(2[0-4]|1?[0-9])?[0-9]))`) - hostnameRegex = regexp.MustCompile(`"hostname":"([^\\\\"]|\\\\")*"`) - - fontLight, fontBold *truetype.Font - labelFace, valueFace, smallLabelFace, orgFace, watermarkFace font.Face - - canvasWidth, canvasHeight = 800, 600 - dpi = 150.0 - colorLabel = image.NewUniform(color.RGBA{40, 40, 40, 255}) - colorDownload = image.NewUniform(color.RGBA{96, 96, 170, 255}) - colorUpload = image.NewUniform(color.RGBA{96, 96, 96, 255}) - colorPing = image.NewUniform(color.RGBA{170, 96, 96, 255}) - colorJitter = image.NewUniform(color.RGBA{170, 96, 96, 255}) - colorMeasure = image.NewUniform(color.RGBA{40, 40, 40, 255}) - colorISP = image.NewUniform(color.RGBA{40, 40, 40, 255}) - colorWatermark = image.NewUniform(color.RGBA{160, 160, 160, 255}) - colorSeparator = image.NewUniform(color.RGBA{192, 192, 192, 255}) -) - -type Result struct { - ProcessedString string `json:"processedString"` - RawISPInfo IPInfoResponse `json:"rawIspInfo"` -} - -type IPInfoResponse struct { - IP string `json:"ip"` - Hostname string `json:"hostname"` - City string `json:"city"` - Region string `json:"region"` - Country string `json:"country"` - Location string `json:"loc"` - Organization string `json:"org"` - Postal string `json:"postal"` - Timezone string `json:"timezone"` - Readme string `json:"readme"` -} - -func init() { - // changed to use Noto Sans instead of OpenSans, due to issue: - // https://github.com/golang/freetype/issues/8 - if b, err := ioutil.ReadFile("assets/NotoSansDisplay-Light.ttf"); err != nil { - log.Fatalf("Error opening NotoSansDisplay-Light font: %s", err) - } else { - f, err := freetype.ParseFont(b) - if err != nil { - log.Fatalf("Error parsing NotoSansDisplay-Light font: %s", err) - } - fontLight = f - } - - if b, err := ioutil.ReadFile("assets/NotoSansDisplay-Medium.ttf"); err != nil { - log.Fatalf("Error opening NotoSansDisplay-Medium font: %s", err) - } else { - f, err := freetype.ParseFont(b) - if err != nil { - log.Fatalf("Error parsing NotoSansDisplay-Medium font: %s", err) - } - fontBold = f - } - - labelFace = truetype.NewFace(fontBold, &truetype.Options{ - Size: 26, - DPI: dpi, - Hinting: font.HintingFull, - }) - - valueFace = truetype.NewFace(fontLight, &truetype.Options{ - Size: 36, - DPI: dpi, - Hinting: font.HintingFull, - }) - - smallLabelFace = truetype.NewFace(fontBold, &truetype.Options{ - Size: 20, - DPI: dpi, - Hinting: font.HintingFull, - }) - - orgFace = truetype.NewFace(fontBold, &truetype.Options{ - Size: 16, - DPI: dpi, - Hinting: font.HintingFull, - }) - - watermarkFace = truetype.NewFace(fontLight, &truetype.Options{ - Size: 14, - DPI: dpi, - Hinting: font.HintingFull, - }) -} - -func Record(w http.ResponseWriter, r *http.Request) { - ipAddr, _, _ := net.SplitHostPort(r.RemoteAddr) - userAgent := r.UserAgent() - language := r.Header.Get("Accept-Language") - - ispInfo := r.FormValue("ispinfo") - download := r.FormValue("dl") - upload := r.FormValue("ul") - ping := r.FormValue("ping") - jitter := r.FormValue("jitter") - logs := r.FormValue("log") - extra := r.FormValue("extra") - - if config.LoadedConfig().RedactIP { - ipAddr = "0.0.0.0" - ipv4Regex.ReplaceAllString(ispInfo, "0.0.0.0") - ipv4Regex.ReplaceAllString(logs, "0.0.0.0") - ipv6Regex.ReplaceAllString(ispInfo, "0.0.0.0") - ipv6Regex.ReplaceAllString(logs, "0.0.0.0") - hostnameRegex.ReplaceAllString(ispInfo, `"hostname":"REDACTED"`) - hostnameRegex.ReplaceAllString(logs, `"hostname":"REDACTED"`) - } - - var record schema.TelemetryData - record.IPAddress = ipAddr - if ispInfo == "" { - record.ISPInfo = "{}" - } else { - record.ISPInfo = ispInfo - } - record.Extra = extra - record.UserAgent = userAgent - record.Language = language - record.Download = download - record.Upload = upload - record.Ping = ping - record.Jitter = jitter - record.Log = logs - - t := time.Now() - entropy := ulid.Monotonic(rand.New(rand.NewSource(t.UnixNano())), 0) - uuid := ulid.MustNew(ulid.Timestamp(t), entropy) - record.UUID = uuid.String() - - err := database.DB.Insert(&record) - if err != nil { - log.Errorf("Error inserting into database: %s", err) - w.WriteHeader(http.StatusInternalServerError) - return - } - - if _, err := w.Write([]byte("id " + uuid.String())); err != nil { - log.Errorf("Error writing ID to telemetry request: %s", err) - w.WriteHeader(http.StatusInternalServerError) - } -} - -func DrawPNG(w http.ResponseWriter, r *http.Request) { - uuid := r.FormValue("id") - record, err := database.DB.FetchByUUID(uuid) - if err != nil { - log.Errorf("Error querying database: %s", err) - w.WriteHeader(http.StatusInternalServerError) - return - } - - var result Result - if err := json.Unmarshal([]byte(record.ISPInfo), &result); err != nil { - log.Errorf("Error parsing ISP info: %s", err) - w.WriteHeader(http.StatusInternalServerError) - return - } - - canvas := image.NewRGBA(image.Rectangle{ - Min: image.Point{}, - Max: image.Point{ - X: canvasWidth, - Y: canvasHeight, - }, - }) - - draw.Draw(canvas, canvas.Bounds(), image.NewUniform(color.White), image.Point{}, draw.Src) - - drawer := &font.Drawer{ - Dst: canvas, - Face: labelFace, - } - - drawer.Src = colorLabel - - // labels - p := drawer.MeasureString(labelPing) - x := canvasWidth/4 - p.Round()/2 - drawer.Dot = freetype.Pt(x, canvasHeight/10) - drawer.DrawString(labelPing) - - p = drawer.MeasureString(labelJitter) - x = canvasWidth*3/4 - p.Round()/2 - drawer.Dot = freetype.Pt(x, canvasHeight/10) - drawer.DrawString(labelJitter) - - p = drawer.MeasureString(labelDownload) - x = canvasWidth/4 - p.Round()/2 - drawer.Dot = freetype.Pt(x, canvasHeight/2) - drawer.DrawString(labelDownload) - - p = drawer.MeasureString(labelUpload) - x = canvasWidth*3/4 - p.Round()/2 - drawer.Dot = freetype.Pt(x, canvasHeight/2) - drawer.DrawString(labelUpload) - - drawer.Face = smallLabelFace - drawer.Src = colorMeasure - p = drawer.MeasureString(labelMbps) - x = canvasWidth/4 - p.Round()/2 - drawer.Dot = freetype.Pt(x, canvasHeight*8/10) - drawer.DrawString(labelMbps) - - p = drawer.MeasureString(labelMbps) - x = canvasWidth*3/4 - p.Round()/2 - drawer.Dot = freetype.Pt(x, canvasHeight*8/10) - drawer.DrawString(labelMbps) - - msLength := drawer.MeasureString(labelMS) - - // ping value - drawer.Face = valueFace - pingValue := strings.Split(record.Ping, ".")[0] - p = drawer.MeasureString(pingValue) - - x = canvasWidth/4 - (p.Round()+msLength.Round())/2 - drawer.Dot = freetype.Pt(x, canvasHeight*11/40) - drawer.Src = colorPing - drawer.DrawString(pingValue) - x = x + p.Round() - drawer.Dot = freetype.Pt(x, canvasHeight*11/40) - drawer.Src = colorMeasure - drawer.Face = smallLabelFace - drawer.DrawString(labelMS) - - // jitter value - drawer.Face = valueFace - jitterValue := strings.Split(record.Jitter, ".")[0] - p = drawer.MeasureString(jitterValue) - x = canvasWidth*3/4 - (p.Round()+msLength.Round())/2 - drawer.Dot = freetype.Pt(x, canvasHeight*11/40) - drawer.Src = colorJitter - drawer.DrawString(jitterValue) - drawer.Face = smallLabelFace - x = x + p.Round() - drawer.Dot = freetype.Pt(x, canvasHeight*11/40) - drawer.Src = colorMeasure - drawer.DrawString(labelMS) - - // download value - drawer.Face = valueFace - p = drawer.MeasureString(record.Download) - x = canvasWidth/4 - p.Round()/2 - drawer.Dot = freetype.Pt(x, canvasHeight*27/40) - drawer.Src = colorDownload - drawer.DrawString(record.Download) - - // upload value - p = drawer.MeasureString(record.Upload) - x = canvasWidth*3/4 - p.Round()/2 - drawer.Dot = freetype.Pt(x, canvasHeight*27/40) - drawer.Src = colorUpload - drawer.DrawString(record.Upload) - - // watermark - ctx := freetype.NewContext() - ctx.SetFont(fontLight) - ctx.SetFontSize(14) - ctx.SetDPI(dpi) - ctx.SetHinting(font.HintingFull) - - drawer.Face = watermarkFace - drawer.Src = colorWatermark - p = drawer.MeasureString(watermark) - x = canvasWidth - p.Round() - 5 - drawer.Dot = freetype.Pt(x, canvasHeight-10) - drawer.DrawString(watermark) - - // separator - for i := canvas.Bounds().Min.X; i < canvas.Bounds().Max.X; i++ { - canvas.Set(i, canvasHeight-ctx.PointToFixed(14).Round()-10, colorSeparator) - } - - // ISP info - drawer.Face = orgFace - drawer.Src = colorISP - drawer.Dot = freetype.Pt(6, canvasHeight-ctx.PointToFixed(14).Round()-15) - if result.RawISPInfo.Organization != "" { - removeRegexp := regexp.MustCompile(`AS\d+\s`) - org := removeRegexp.ReplaceAllString(result.RawISPInfo.Organization, "") - if result.RawISPInfo.Country != "" { - org += ", " + result.RawISPInfo.Country - } - drawer.DrawString(org) - } else { - drawer.DrawString(result.ProcessedString) - } - - w.Header().Set("Content-Disposition", "inline; filename="+uuid+".png") - w.Header().Set("Content-Type", "image/png") - if err := png.Encode(w, canvas); err != nil { - log.Errorf("Failed to output image to HTTP client: %s", err) - } -} diff --git a/settings.toml b/settings.toml deleted file mode 100644 index 42ef444..0000000 --- a/settings.toml +++ /dev/null @@ -1,24 +0,0 @@ -# bind address, use empty string to bind to all interfaces -bind_address="" -# backend listen port -listen_port=8989 -# Server location -server_lat=0 -server_lng=0 -# ipinfo.io API key, if applicable -ipinfo_api_key="" - -# password for logging into statistics page -statistics_password="PASSWORD" -# redact IP addresses -redact_ip_addresses=false - -# database type for statistics data, currently supports: bolt, mysql, postgresql -database_type="bolt" -database_hostname="" -database_name="" -database_username="" -database_password="" - -# if you use `bolt` as database, set database_file to database file location -database_file="speedtest.db" diff --git a/web/helpers.go b/web/helpers.go deleted file mode 100644 index 9d31328..0000000 --- a/web/helpers.go +++ /dev/null @@ -1,167 +0,0 @@ -package web - -import ( - "crypto/rand" - "encoding/json" - "fmt" - "io/ioutil" - "math" - "net/http" - "strconv" - "strings" - - "github.com/librespeed/speedtest/config" - "github.com/librespeed/speedtest/results" - - log "github.com/sirupsen/logrus" -) - -var ( - // get server location from ipinfo.io from start to minimize API access - serverLat, serverLng = getServerLocation() - // for testing - // serverLat, serverLng = 22.7702, 112.9578 - // serverLat, serverLng = 23.018, 113.7487 -) - -func getRandomData(length int) []byte { - data := make([]byte, length) - if _, err := rand.Read(data); err != nil { - log.Fatalf("Failed to generate random data: %s", err) - } - return data -} - -func getIPInfoURL(address string) string { - apiKey := config.LoadedConfig().IPInfoAPIKey - - ipInfoURL := `https://ipinfo.io/%s/json` - if address != "" { - ipInfoURL = fmt.Sprintf(ipInfoURL, address) - } else { - ipInfoURL = "https://ipinfo.io/json" - } - - if apiKey != "" { - ipInfoURL += "?token=" + apiKey - } - - return ipInfoURL -} - -func getIPInfo(addr string) results.IPInfoResponse { - var ret results.IPInfoResponse - resp, err := http.DefaultClient.Get(getIPInfoURL(addr)) - if err != nil { - log.Errorf("Error getting response from ipinfo.io: %s", err) - return ret - } - - raw, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Errorf("Error reading response from ipinfo.io: %s", err) - return ret - } - defer resp.Body.Close() - - if err := json.Unmarshal(raw, &ret); err != nil { - log.Errorf("Error parsing response from ipinfo.io: %s", err) - } - - return ret -} - -func getServerLocation() (float64, float64) { - conf := config.LoadedConfig() - - if conf.ServerLat > 0 && conf.ServerLng > 0 { - log.Infof("Configured server coordinates: %.6f, %.6f", conf.ServerLat, conf.ServerLng) - return conf.ServerLat, conf.ServerLng - } - - var ret results.IPInfoResponse - resp, err := http.DefaultClient.Get(getIPInfoURL("")) - if err != nil { - log.Errorf("Error getting repsonse from ipinfo.io: %s", err) - return 0, 0 - } - raw, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Errorf("Error reading response from ipinfo.io: %s", err) - return 0, 0 - } - defer resp.Body.Close() - - if err := json.Unmarshal(raw, &ret); err != nil { - log.Errorf("Error parsing response from ipinfo.io: %s", err) - return 0, 0 - } - - var lat, lng float64 - if ret.Location != "" { - lat, lng = parseLocationString(ret.Location) - } - - log.Infof("Fetched server coordinates: %.6f, %.6f", lat, lng) - - return lat, lng -} - -func parseLocationString(location string) (float64, float64) { - parts := strings.Split(location, ",") - if len(parts) != 2 { - log.Errorf("Unknown location format: %s", location) - return 0, 0 - } - - lat, err := strconv.ParseFloat(parts[0], 64) - if err != nil { - log.Errorf("Error parsing latitude: %s", parts[0]) - return 0, 0 - } - - lng, err := strconv.ParseFloat(parts[1], 64) - if err != nil { - log.Errorf("Error parsing longitude: %s", parts[0]) - return 0, 0 - } - - return lat, lng -} - -func calculateDistance(clientLocation string, unit string) string { - clientLat, clientLng := parseLocationString(clientLocation) - - radlat1 := float64(math.Pi * serverLat / 180) - radlat2 := float64(math.Pi * clientLat / 180) - - theta := float64(serverLng - clientLng) - radtheta := float64(math.Pi * theta / 180) - - dist := math.Sin(radlat1)*math.Sin(radlat2) + math.Cos(radlat1)*math.Cos(radlat2)*math.Cos(radtheta) - - if dist > 1 { - dist = 1 - } - - dist = math.Acos(dist) - dist = dist * 180 / math.Pi - dist = dist * 60 * 1.1515 - - unitString := " mi" - switch unit { - case "km": - dist = dist * 1.609344 - unitString = " km" - case "NM": - dist = dist * 0.8684 - unitString = " NM" - } - - return fmt.Sprintf("%d%s", round(dist), unitString) -} - -func round(v float64) int { - r := int(math.Round(v)) - return 10 * ((r + 9) / 10) -} diff --git a/web/web.go b/web/web.go deleted file mode 100644 index 9ba56d1..0000000 --- a/web/web.go +++ /dev/null @@ -1,190 +0,0 @@ -package web - -import ( - "encoding/json" - "io" - "io/ioutil" - "net" - "net/http" - "regexp" - "strconv" - "strings" - - "github.com/go-chi/chi" - "github.com/go-chi/chi/middleware" - "github.com/go-chi/cors" - "github.com/go-chi/render" - log "github.com/sirupsen/logrus" - - "github.com/librespeed/speedtest/config" - "github.com/librespeed/speedtest/results" -) - -const ( - // chunk size is 1 mib - chunkSize = 1048576 -) - -var ( - // generate random data for download test on start to minimize runtime overhead - randomData = getRandomData(chunkSize) -) - -func ListenAndServe(conf *config.Config) error { - r := chi.NewMux() - r.Use(middleware.RealIP) - - cs := cors.New(cors.Options{ - AllowedOrigins: []string{"*"}, - AllowedMethods: []string{"GET", "POST", "OPTIONS"}, - AllowedHeaders: []string{"*"}, - }) - - r.Use(cs.Handler) - r.Use(middleware.NoCache) - r.Use(middleware.Logger) - - log.Infof("Starting backend server on %s", net.JoinHostPort(conf.BindAddress, conf.Port)) - r.Get("/*", pages) - r.HandleFunc("/empty", empty) - r.Get("/garbage", garbage) - r.Get("/getIP", getIP) - r.Get("/results", results.DrawPNG) - r.Get("/results/", results.DrawPNG) - r.Post("/results/telemetry", results.Record) - r.HandleFunc("/stats", results.Stats) - - // PHP frontend default values compatibility - r.HandleFunc("/empty.php", empty) - r.Get("/garbage.php", garbage) - r.Get("/getIP.php", getIP) - r.Post("/results/telemetry.php", results.Record) - r.HandleFunc("/stats.php", results.Stats) - - return http.ListenAndServe(net.JoinHostPort(conf.BindAddress, conf.Port), r) -} - -func pages(w http.ResponseWriter, r *http.Request) { - if r.RequestURI == "/" { - r.RequestURI = "/index.html" - } - - uri := strings.Split(r.RequestURI, "?")[0] - if strings.HasSuffix(uri, ".html") || strings.HasSuffix(uri, ".js") { - http.FileServer(http.Dir("assets")).ServeHTTP(w, r) - } else { - w.WriteHeader(http.StatusForbidden) - } -} - -func empty(w http.ResponseWriter, r *http.Request) { - io.Copy(ioutil.Discard, r.Body) - r.Body.Close() - - w.Header().Set("Connection", "keep-alive") - w.WriteHeader(http.StatusOK) -} - -func garbage(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Content-Description", "File Transfer") - w.Header().Set("Content-Type", "application/octet-stream") - w.Header().Set("Content-Disposition", "attachment; filename=random.dat") - w.Header().Set("Content-Transfer-Encoding", "binary") - - // chunk size set to 4 by default - chunks := 4 - - ckSize := r.FormValue("ckSize") - if ckSize != "" { - i, err := strconv.ParseInt(ckSize, 10, 64) - if err != nil { - log.Errorf("Invalid chunk size: %s", ckSize) - log.Warn("Will use default value %d", chunks) - } else { - // limit max chunk size to 1024 - if i > 1024 { - chunks = 1024 - } else { - chunks = int(i) - } - } - } - - for i := 0; i < chunks; i++ { - if _, err := w.Write(randomData); err != nil { - log.Errorf("Error writing back to client at chunk number %d: %s", i, err) - break - } - } -} - -func getIP(w http.ResponseWriter, r *http.Request) { - var ret results.Result - - clientIP := r.RemoteAddr - clientIP = strings.ReplaceAll(clientIP, "::ffff:", "") - - ip, _, err := net.SplitHostPort(r.RemoteAddr) - if err == nil { - clientIP = ip - } - - isSpecialIP := true - switch { - case clientIP == "::1": - ret.ProcessedString = clientIP + " - localhost IPv6 access" - case strings.HasPrefix(clientIP, "fe80:"): - ret.ProcessedString = clientIP + " - link-local IPv6 access" - case strings.HasPrefix(clientIP, "127."): - ret.ProcessedString = clientIP + " - localhost IPv4 access" - case strings.HasPrefix(clientIP, "10."): - ret.ProcessedString = clientIP + " - private IPv4 access" - case regexp.MustCompile(`^172\.(1[6-9]|2\d|3[01])\.`).MatchString(clientIP): - ret.ProcessedString = clientIP + " - private IPv4 access" - case strings.HasPrefix(clientIP, "192.168"): - ret.ProcessedString = clientIP + " - private IPv4 access" - case strings.HasPrefix(clientIP, "169.254"): - ret.ProcessedString = clientIP + " - link-local IPv4 access" - case regexp.MustCompile(`^100\.([6-9][0-9]|1[0-2][0-7])\.`).MatchString(clientIP): - ret.ProcessedString = clientIP + " - CGNAT IPv4 access" - default: - isSpecialIP = false - } - - if isSpecialIP { - b, _ := json.Marshal(&ret) - if _, err := w.Write(b); err != nil { - log.Errorf("Error writing to client: %s", err) - } - return - } - - getISPInfo := r.FormValue("isp") == "true" - distanceUnit := r.FormValue("distance") - - ret.ProcessedString = clientIP - - if getISPInfo { - ispInfo := getIPInfo(clientIP) - ret.RawISPInfo = ispInfo - - removeRegexp := regexp.MustCompile(`AS\d+\s`) - isp := removeRegexp.ReplaceAllString(ispInfo.Organization, "") - - if isp == "" { - isp = "Unknown ISP" - } - - if ispInfo.Country != "" { - isp += ", " + ispInfo.Country - } - - if ispInfo.Location != "" { - isp += " (" + calculateDistance(ispInfo.Location, distanceUnit) + ")" - } - - ret.ProcessedString += " - " + isp - } - - render.JSON(w, r, ret) -}