Added v1.12.0 files

This commit is contained in:
Henry Whitaker
2021-04-11 09:23:18 +01:00
parent e68d360274
commit 1c8017f902
74 changed files with 951 additions and 72 deletions

View File

@@ -1,6 +1,6 @@
# Speedtest Tracker
[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.11.1-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE)
[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.12.0-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE)
This program runs a speedtest check every hour and graphs the results. The back-end is written in [Laravel](https://laravel.com/) and the front-end uses [React](https://reactjs.org/). It uses [Ookla's Speedtest cli](https://www.speedtest.net/apps/cli) to get the data and uses [Chart.js](https://www.chartjs.org/) to plot the results.

View File

@@ -1,6 +1,6 @@
# Speedtest Tracker
[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.11.1-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE)
[![Docker pulls](https://img.shields.io/docker/pulls/henrywhitaker3/speedtest-tracker?style=flat-square)](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Stable?label=master&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/henrywhitaker3/Speedtest-Tracker/Dev?label=dev&logo=github&style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/actions) [![last_commit](https://img.shields.io/github/last-commit/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) [![issues](https://img.shields.io/github/issues/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/issues) [![commit_freq](https://img.shields.io/github/commit-activity/m/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/commits) ![version](https://img.shields.io/badge/version-v1.12.0-success?style=flat-square) [![license](https://img.shields.io/github/license/henrywhitaker3/Speedtest-Tracker?style=flat-square)](https://github.com/henrywhitaker3/Speedtest-Tracker/blob/master/LICENSE)
This program runs a speedtest check every hour and graphs the results. The back-end is written in [Laravel](https://laravel.com/) and the front-end uses [React](https://reactjs.org/). It uses the [Ookla's speedtest cli](https://www.speedtest.net/apps/cli) package to get the data and uses [Chart.js](https://www.chartjs.org/) to plot the results.
@@ -18,6 +18,7 @@ Disclaimer: You will need to accept Ookla's EULA and privacy agreements in order
- Slack/Discord/Telegram notifications
- [healthchecks.io](https://healthchecks.io) integration
- Organizr integration
- InfluxDB integration (currently v1 only, v2 is a WIP)
## Installation & Setup
@@ -84,6 +85,8 @@ Container images are configured using parameters passed at runtime (such as thos
| `-e PUID` | Optional. Supply a local user ID for volume permissions |
| `-e PGID` | Optional. Supply a local group ID for volume permissions |
| `-e AUTH` | Optional. Set to 'true' to enable authentication for the app |
| `-e INFLUXDB_RETENTION`| Optional. Sets the InfluxDB retention period, defaults to `30d` |
| `-e INFLUXDB_HOST_TAG | Optional. Sets the InfluxDB host tag value, defaults to `speedtest` |
### Authentication
@@ -101,3 +104,7 @@ After enabling, you should change the password through the web UI.
### Manual Install
For manual installations, please follow the instructions [here](https://github.com/henrywhitaker3/Speedtest-Tracker/wiki/Manual-Installation).
### Kubernetes
There is a 3rd party helm chart available [here](https://github.com/sOblivionsCall/charts).

View File

@@ -2,7 +2,7 @@
namespace App\Actions;
use App\Speedtest;
use App\Models\Speedtest;
use Cache;
use Carbon\Carbon;
use DB;

View File

@@ -4,7 +4,7 @@ namespace App\Actions;
use App\Helpers\SettingsHelper;
use App\Helpers\SpeedtestHelper;
use App\Speedtest;
use App\Models\Speedtest;
use DB;
use Henrywhitaker3\LaravelActions\Interfaces\ActionInterface;

View File

@@ -3,7 +3,7 @@
namespace App\Actions;
use App\Helpers\SettingsHelper;
use App\Speedtest;
use App\Models\Speedtest;
use Cache;
use Carbon\Carbon;
use Henrywhitaker3\LaravelActions\Interfaces\ActionInterface;

View File

@@ -2,7 +2,7 @@
namespace App\Console\Commands;
use App\Auth\LoginSession;
use App\Models\Auth\LoginSession;
use Carbon\Carbon;
use Illuminate\Console\Command;
use Log;

View File

@@ -0,0 +1,10 @@
<?php
namespace App\Exceptions;
use Exception;
class InfluxDBConnectionErrorException extends Exception
{
//
}

View File

@@ -0,0 +1,10 @@
<?php
namespace App\Exceptions;
use Exception;
class InfluxDBNotEnabledException extends Exception
{
//
}

View File

@@ -2,7 +2,7 @@
namespace App\Helpers;
use App\Speedtest;
use App\Models\Speedtest;
use Cache;
use DateTime;
use Exception;

View File

@@ -2,8 +2,8 @@
namespace App\Helpers;
use App\Auth\EmailVerification;
use App\User;
use App\Models\Auth\EmailVerification;
use App\Models\User;
class EmailVerificationHelper {
public static function checkVerificationAttempt($userID, $token)

View File

@@ -3,7 +3,7 @@
namespace App\Helpers;
use App\Events\TestNotificationEvent;
use App\Setting;
use App\Models\Setting;
use Cache;
use Carbon\Carbon;

View File

@@ -2,7 +2,8 @@
namespace App\Helpers;
use App\Speedtest;
use App\Interfaces\SpeedtestProvider;
use App\Models\Speedtest;
use App\Utils\OoklaTester;
use Carbon\Carbon;
use Exception;
@@ -25,7 +26,7 @@ class SpeedtestHelper
*/
public static function runSpeedtest()
{
$tester = new OoklaTester();
$tester = app()->make(SpeedtestProvider::class);
return $tester->run();
}

View File

@@ -2,14 +2,14 @@
namespace App\Http\Controllers;
use App\Auth\EmailVerification;
use App\Auth\LoginSession as AuthLoginSession;
use App\Models\Auth\EmailVerification;
use App\Models\Auth\LoginSession as AuthLoginSession;
use App\Helpers\EmailVerificationHelper;
use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\Controller;
use App\LoginSession;
use App\Rules\CurrentPasswordMatches;
use App\User;
use App\Models\User;
use DateTime;
use Hash;
use Illuminate\Support\Facades\Request as RequestFacade;

View File

@@ -4,7 +4,7 @@ namespace App\Http\Controllers;
use App\Helpers\SettingsHelper;
use App\Rules\Cron;
use App\Setting;
use App\Models\Setting;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Validator;

View File

@@ -9,7 +9,7 @@ use App\Actions\QueueSpeedtest;
use App\Helpers\SettingsHelper;
use App\Helpers\SpeedtestHelper;
use App\Jobs\SpeedtestJob;
use App\Speedtest;
use App\Models\Speedtest;
use Carbon\Carbon;
use Exception;
use Illuminate\Http\Request;

View File

@@ -2,7 +2,7 @@
namespace App\Http\Middleware;
use App\Auth\LoginSession;
use App\Models\Auth\LoginSession;
use Closure;
use Exception;

View File

@@ -0,0 +1,13 @@
<?php
namespace App\Interfaces;
use App\Models\Speedtest;
interface InfluxDBWrapperInterface
{
public function testConnection(): bool;
public function doesDatabaseExist(string $database): bool;
public function createDatabase(string $database): bool;
public function store(Speedtest $speedtest): bool;
}

View File

@@ -2,7 +2,7 @@
namespace App\Interfaces;
use App\Speedtest;
use App\Models\Speedtest;
interface SpeedtestProvider
{

View File

@@ -0,0 +1,14 @@
<?php
namespace App\Models\Auth;
use Illuminate\Database\Eloquent\Model;
class EmailVerification extends Model
{
protected $fillable = [
'user_id',
'token',
'expires'
];
}

View File

@@ -0,0 +1,21 @@
<?php
namespace App\Models\Auth;
use Illuminate\Database\Eloquent\Model;
class LoginSession extends Model
{
protected $fillable = [
'id',
'token',
'active',
'user_id',
'expires',
'ip'
];
protected $table = 'active_sessions';
public $incrementing = false;
}

View File

@@ -0,0 +1,25 @@
<?php
namespace App\Models;
use App\Casts\CommaSeparatedArrayCast;
use App\Helpers\SettingsHelper;
use Illuminate\Database\Eloquent\Model;
class Setting extends Model
{
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'name', 'value', 'description'
];
protected $table = 'settings';
protected $casts = [
'value' => CommaSeparatedArrayCast::class,
];
}

View File

@@ -0,0 +1,45 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class Speedtest extends Model
{
use HasFactory;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'ping',
'download',
'upload',
'created_at',
'server_id',
'server_name',
'server_host',
'url',
'scheduled',
'failed',
];
protected $table = 'speedtests';
public function formatForInfluxDB()
{
return [
'id' => (int) $this->id,
'download' => (float) $this->download,
'upload' => (float) $this->upload,
'ping' => (float) $this->ping,
'server_id' => (int) $this->server_id,
'server_host' => $this->server_host,
'server_name' => $this->server_name,
'scheduled' => (bool) $this->scheduled,
];
}
}

View File

@@ -0,0 +1,114 @@
<?php
namespace App\Models;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Facades\Hash;
use Tymon\JWTAuth\Contracts\JWTSubject;
class User extends Authenticatable implements JWTSubject
{
use Notifiable;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'name', 'email', 'password', 'id', 'email_verified_at'
];
/**
* The attributes that should be hidden for arrays.
*
* @var array
*/
protected $hidden = [
'password',
];
/**
* The attributes that should be cast to native types.
*
* @var array
*/
protected $casts = [
'email_verified_at' => 'datetime',
];
protected $primaryKey = 'id';
protected $keyType = 'uuid';
public $incrementing = false;
public static function loginRules()
{
return [
'email' => 'required',
'password' => 'required'
];
}
public static function registerRules()
{
return [
'name' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
'password' => ['required', 'string', 'min:8', 'confirmed']
];
}
public static function updateRules()
{
return [
'name' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users']
];
}
public function verification()
{
return $this->hasOne('\App\Auth\EmailVerification');
}
/**
* Returns a user's login sessions
*
* @return mixed
*/
public function sessions()
{
return $this->hasMany('\App\Auth\LoginSession');
}
/**
* Get the identifier that will be stored in the subject claim of the JWT.
*
* @return mixed
*/
public function getJWTIdentifier()
{
return $this->getKey();
}
/**
* Return a key value array, containing any custom claims to be added to the JWT.
*
* @return array
*/
public function getJWTCustomClaims()
{
return [];
}
public function setPasswordAttribute($password)
{
if (!empty($password)) {
$this->attributes['password'] = Hash::make($password);
}
}
}

View File

@@ -0,0 +1,30 @@
<?php
namespace App\Observers;
use App\Exceptions\InfluxDBNotEnabledException;
use App\Models\Speedtest;
use App\Utils\InfluxDB\InfluxDB;
use Exception;
use Log;
class SpeedtestObserver
{
/**
* Handle the Speedtest "created" event.
*
* @param \App\Speedtest $speedtest
* @return void
*/
public function created(Speedtest $speedtest)
{
try {
InfluxDB::connect()
->store($speedtest);
} catch (InfluxDBNotEnabledException $e) {
// /
} catch (Exception $e) {
Log::error($e);
}
}
}

View File

@@ -10,6 +10,8 @@ use App\Listeners\SpeedtestCompleteListener;
use App\Listeners\SpeedtestFailedListener;
use App\Listeners\SpeedtestOverviewListener;
use App\Listeners\TestNotificationListener;
use App\Observers\SpeedtestObserver;
use App\Models\Speedtest;
use Illuminate\Auth\Events\Registered;
use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
@@ -49,6 +51,6 @@ class EventServiceProvider extends ServiceProvider
{
parent::boot();
//
Speedtest::observe(SpeedtestObserver::class);
}
}

View File

@@ -0,0 +1,113 @@
<?php
namespace App\Utils\InfluxDB;
use App\Exceptions\InfluxDBConnectionErrorException;
use App\Exceptions\InfluxDBNotEnabledException;
use App\Helpers\SettingsHelper;
use App\Models\Speedtest;
use InfluxDB\Client as Version1;
use InfluxDB2\Client as Version2;
use App\Interfaces\InfluxDBWrapperInterface as Client;
class InfluxDB
{
private Client $client;
private string $database;
public function __construct(Client $client)
{
$this->client = $client;
}
/**
* Connect to influx db
*
* @param string $host
* @param integer $port
* @param string $database
* @return InfluxDB
*/
public static function connect()
{
if (!(bool) SettingsHelper::get('influx_db_enabled')->value) {
throw new InfluxDBNotEnabledException();
}
$host = SettingsHelper::get('influx_db_host')->value;
$port = SettingsHelper::get('influx_db_port')->value;
$username = SettingsHelper::get('influx_db_username')->value;
$password = SettingsHelper::get('influx_db_password')->value;
$database = SettingsHelper::get('influx_db_database')->value;
$version = (int) SettingsHelper::get('influx_db_version')->value;
$wrapper = $version === 1
? new InfluxDBVersion1Wrapper(
new Version1(
str_replace(['http://', 'https://'], '', $host),
$port,
$username,
$password
)
)
: new InfluxDBVersion2Wrapper(
new Version2([
'url' => $host . ':' . $port,
'token' => '',
])
);
return (new self($wrapper))->setDatabase($database)
->testConnection();
}
/**
* Set the database field
*
* @param string $database
* @return InfluxDB
*/
public function setDatabase(string $database): InfluxDB
{
$this->database = $database;
return $this;
}
/**
* Test the connection
*
* @throws InfluxDBConnectionErrorException
* @return InfluxDB
*/
public function testConnection(): InfluxDB
{
if (!$this->client->testConnection()) {
throw new InfluxDBConnectionErrorException();
}
if (!$this->doesDatabaseExist()) {
$this->createDatabase();
}
return $this;
}
public function doesDatabaseExist(): bool
{
return $this->client->doesDatabaseExist($this->database);
}
public function createDatabase(): bool
{
return $this->client->createDatabase($this->database);
}
public function store(Speedtest $speedtest): InfluxDB
{
$this->client->store($speedtest);
return $this;
}
}

View File

@@ -0,0 +1,74 @@
<?php
namespace App\Utils\InfluxDB;
use App\Interfaces\InfluxDBWrapperInterface;
use App\Models\Speedtest;
use Exception;
use InfluxDB\Client;
use InfluxDB\Database;
use InfluxDB\Database\RetentionPolicy;
use InfluxDB\Point;
use Log;
class InfluxDBVersion1Wrapper implements InfluxDBWrapperInterface
{
private Client $client;
private Database $database;
public function __construct(Client $client)
{
$this->client = $client;
}
public function testConnection(): bool
{
try {
$this->client->listDatabases();
return true;
} catch (Exception $e) {
Log::error($e);
return false;
}
}
public function doesDatabaseExist(string $database): bool
{
$this->database = $this->client->selectDB($database);
return (bool) $this->database->exists();
}
public function createDatabase(string $database): bool
{
try {
$this->database->create(
new RetentionPolicy(
'speedtest_retention_policy',
config('services.influxdb.retention'),
1,
true
)
);
return true;
} catch (Exception $e) {
Log::error($e);
return false;
}
}
public function store(Speedtest $speedtest): bool
{
return $this->database->writePoints([
new Point(
'speedtest',
null,
['host' => config('services.influxdb.host')],
$speedtest->formatForInfluxDB(),
)
]);
}
}

View File

@@ -0,0 +1,37 @@
<?php
namespace App\Utils\InfluxDB;
use App\Interfaces\InfluxDBWrapperInterface;
use App\Models\Speedtest;
use InfluxDB2\Client;
class InfluxDBVersion2Wrapper implements InfluxDBWrapperInterface
{
private Client $client;
public function __construct(Client $client)
{
$this->client = $client;
}
public function testConnection(): bool
{
return $this->client->health()->getStatus() !== 'pass';
}
public function doesDatabaseExist(string $database): bool
{
return true;
}
public function createDatabase(string $database): bool
{
return true;
}
public function store(Speedtest $speedtest): bool
{
return true;
}
}

View File

@@ -6,7 +6,7 @@ use App\Exceptions\SpeedtestFailureException;
use App\Helpers\SettingsHelper;
use App\Helpers\SpeedtestHelper;
use App\Interfaces\SpeedtestProvider;
use App\Speedtest;
use App\Models\Speedtest;
use Cache;
use Exception;
use JsonException;

View File

@@ -1,4 +1,10 @@
{
"1.12.0": [
{
"description": "Added InfluxDB intergation.",
"link": ""
}
],
"1.11.1": [
{
"description": "Add option to show/hide columns in the all tests table.",

View File

@@ -16,6 +16,8 @@
"guzzlehttp/guzzle": "^7.0.1",
"henrywhitaker3/healthchecks-io": "^1.0",
"henrywhitaker3/laravel-actions": "^1.0",
"influxdata/influxdb-client-php": "^1.12",
"influxdb/influxdb-php": "^1.15",
"laravel-notification-channels/telegram": "^0.5.0",
"laravel/framework": "^8.0",
"laravel/slack-notification-channel": "^2.0",
@@ -45,12 +47,10 @@
},
"autoload": {
"psr-4": {
"App\\": "app/"
},
"classmap": [
"database/seeds",
"database/factories"
]
"App\\": "app/",
"Database\\Factories\\": "database/factories/",
"Database\\Seeders\\": "database/seeders/"
}
},
"autoload-dev": {
"psr-4": {

114
conf/site/composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "2c905613bf401a9978baa23d1a80b710",
"content-hash": "46d75195c9e28db55cd2b086a6846e13",
"packages": [
{
"name": "asm89/stack-cors",
@@ -1309,6 +1309,118 @@
},
"time": "2021-02-06T09:50:49+00:00"
},
{
"name": "influxdata/influxdb-client-php",
"version": "1.12.0",
"source": {
"type": "git",
"url": "https://github.com/influxdata/influxdb-client-php.git",
"reference": "e04f802a4d9c52b5b497077673269e8463fdb6ea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/influxdata/influxdb-client-php/zipball/e04f802a4d9c52b5b497077673269e8463fdb6ea",
"reference": "e04f802a4d9c52b5b497077673269e8463fdb6ea",
"shasum": ""
},
"require": {
"ext-curl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"guzzlehttp/guzzle": "^6.2|^7.0.1",
"php": ">=7.1"
},
"require-dev": {
"phpunit/phpunit": "^7.4|^9.1",
"squizlabs/php_codesniffer": "~2.6"
},
"type": "library",
"autoload": {
"psr-4": {
"InfluxDB2\\": "src/InfluxDB2"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "InfluxDB (v2+) Client Library for PHP",
"homepage": "https://www.github.com/influxdata/influxdb-client-php",
"keywords": [
"influxdb"
],
"support": {
"issues": "https://github.com/influxdata/influxdb-client-php/issues",
"source": "https://github.com/influxdata/influxdb-client-php/tree/1.12.0"
},
"time": "2021-04-01T06:28:57+00:00"
},
{
"name": "influxdb/influxdb-php",
"version": "1.15.2",
"source": {
"type": "git",
"url": "https://github.com/influxdata/influxdb-php.git",
"reference": "d6e59f4f04ab9107574fda69c2cbe36671253d03"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/influxdata/influxdb-php/zipball/d6e59f4f04ab9107574fda69c2cbe36671253d03",
"reference": "d6e59f4f04ab9107574fda69c2cbe36671253d03",
"shasum": ""
},
"require": {
"guzzlehttp/guzzle": "^6.0|^7.0",
"php": "^5.5 || ^7.0 || ^8.0"
},
"require-dev": {
"dms/phpunit-arraysubset-asserts": "^0.2.1",
"phpunit/phpunit": "^9.5"
},
"suggest": {
"ext-curl": "Curl extension, needed for Curl driver",
"stefanotorresi/influxdb-php-async": "An asyncronous client for InfluxDB, implemented via ReactPHP."
},
"type": "library",
"autoload": {
"psr-4": {
"InfluxDB\\": "src/InfluxDB"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Stephen Hoogendijk",
"email": "stephen@tca0.nl"
},
{
"name": "Daniel Martinez",
"email": "danimartcas@hotmail.com"
},
{
"name": "Gianluca Arbezzano",
"email": "gianarb92@gmail.com"
}
],
"description": "InfluxDB client library for PHP",
"keywords": [
"client",
"influxdata",
"influxdb",
"influxdb class",
"influxdb client",
"influxdb library",
"time series"
],
"support": {
"issues": "https://github.com/influxdata/influxdb-php/issues",
"source": "https://github.com/influxdata/influxdb-php/tree/1.15.2"
},
"time": "2020-12-26T17:45:17+00:00"
},
{
"name": "laravel-notification-channels/telegram",
"version": "0.5.1",

View File

@@ -34,4 +34,9 @@ return [
'token' => env('TELEGRAM_BOT_TOKEN', 'YOUR BOT TOKEN HERE')
],
'influxdb' => [
'retention' => env('INFLUXDB_RETENTION', '30d'),
'host' => env('INFLUXDB_HOST_TAG', 'speedtest'),
],
];

View File

@@ -7,7 +7,7 @@ return [
|--------------------------------------------------------------------------
*/
'version' => '1.11.1',
'version' => '1.12.0',
/*
|--------------------------------------------------------------------------

View File

@@ -0,0 +1,32 @@
<?php
namespace Database\Factories;
use App\Models\Speedtest;
use Illuminate\Database\Eloquent\Factories\Factory;
class SpeedtestFactory extends Factory
{
/**
* The name of the factory's corresponding model.
*
* @var string
*/
protected $model = Speedtest::class;
/**
* Define the model's default state.
*
* @return array
*/
public function definition()
{
return [
'download' => rand(15, 900),
'upload' => rand(15, 900),
'ping' => rand(1, 25),
'scheduled' => (bool) rand(0, 1),
'failed' => false,
];
}
}

View File

@@ -2,7 +2,7 @@
/** @var \Illuminate\Database\Eloquent\Factory $factory */
use App\User;
use App\Models\User;
use Faker\Generator as Faker;
use Illuminate\Support\Str;

View File

@@ -1,6 +1,6 @@
<?php
use App\User;
use App\Models\User;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,7 +1,7 @@
<?php
use App\Helpers\SettingsHelper;
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,6 +1,6 @@
<?php
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,6 +1,6 @@
<?php
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,7 +1,7 @@
<?php
use App\Helpers\SettingsHelper;
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,7 +1,7 @@
<?php
use App\Helpers\SettingsHelper;
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,7 +1,7 @@
<?php
use App\Helpers\SettingsHelper;
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,7 +1,7 @@
<?php
use App\Helpers\SettingsHelper;
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,7 +1,7 @@
<?php
use App\Helpers\SettingsHelper;
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,7 +1,7 @@
<?php
use App\Helpers\SettingsHelper;
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,7 +1,7 @@
<?php
use App\Helpers\SettingsHelper;
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,7 +1,7 @@
<?php
use App\Helpers\SettingsHelper;
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,7 +1,7 @@
<?php
use App\Helpers\SettingsHelper;
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,7 +1,7 @@
<?php
use App\Helpers\SettingsHelper;
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,6 +1,6 @@
<?php
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,7 +1,7 @@
<?php
use App\Helpers\SettingsHelper;
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -1,7 +1,7 @@
<?php
use App\Helpers\SettingsHelper;
use App\Setting;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@@ -0,0 +1,92 @@
<?php
use App\Helpers\SettingsHelper;
use App\Models\Setting;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddInfluxDbSettings extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
if (!SettingsHelper::get('influx_db_enabled')) {
Setting::create([
'name' => 'influx_db_enabled',
'value' => false,
'description' => 'Enable the InfluxDB integration for speedtests.'
]);
}
if (!SettingsHelper::get('influx_db_host')) {
Setting::create([
'name' => 'influx_db_host',
'value' => '',
'description' => 'InfluxDB hostname, include the protocol (http:// or https://).'
]);
}
if (!SettingsHelper::get('influx_db_port')) {
Setting::create([
'name' => 'influx_db_port',
'value' => '',
'description' => 'InfluxDB port'
]);
}
if (!SettingsHelper::get('influx_db_database')) {
Setting::create([
'name' => 'influx_db_database',
'value' => '',
'description' => 'InfluxDB database'
]);
}
if (!SettingsHelper::get('influx_db_username')) {
Setting::create([
'name' => 'influx_db_username',
'value' => '',
'description' => 'InfluxDB username'
]);
}
if (!SettingsHelper::get('influx_db_password')) {
Setting::create([
'name' => 'influx_db_password',
'value' => '',
'description' => 'InfluxDB password'
]);
}
if (!SettingsHelper::get('influx_db_version')) {
Setting::create([
'name' => 'influx_db_version',
'value' => 1,
'description' => 'InfluxDB version'
]);
}
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Setting::whereIn('name', [
'influx_db_enabled',
'influx_db_host',
'influx_db_port',
'influx_db_database',
'influx_db_username',
'influx_db_password',
'influx_db_version',
])->delete();
}
}

View File

@@ -1,5 +1,8 @@
<?php
namespace Database\Seeders;
use Database\Seeders\SpeedtestSeeder;
use Illuminate\Database\Seeder;
class DatabaseSeeder extends Seeder
@@ -11,6 +14,6 @@ class DatabaseSeeder extends Seeder
*/
public function run()
{
// $this->call(UserSeeder::class);
$this->call(SpeedtestSeeder::class);
}
}

View File

@@ -0,0 +1,21 @@
<?php
namespace Database\Seeders;
use App\Models\Speedtest;
use Illuminate\Database\Seeder;
class SpeedtestSeeder extends Seeder
{
/**
* Run the database seeds.
*
* @return void
*/
public function run()
{
Speedtest::factory()
->count(250)
->create();
}
}

View File

@@ -7,7 +7,7 @@ use App\Http\Controllers\HomepageDataController;
use App\Http\Controllers\SettingsController;
use App\Http\Controllers\SpeedtestController;
use App\Http\Controllers\UpdateController;
use App\Speedtest;
use App\Models\Speedtest;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Route;

View File

@@ -2,7 +2,7 @@
namespace Tests\Feature;
use App\Speedtest;
use App\Models\Speedtest;
use Faker\Factory;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;

View File

@@ -3,14 +3,28 @@
namespace Tests\Feature;
use App\Helpers\SpeedtestHelper;
use App\Interfaces\SpeedtestProvider;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Tests\Mocks\OoklaTesterMocker;
use Tests\TestCase;
class SpeedtestTest extends TestCase
{
use RefreshDatabase;
public function setUp(): void
{
parent::setUp();
$this->app->singleton(
SpeedtestProvider::class,
function () {
return new OoklaTesterMocker();
}
);
}
/**
* Runs a speedtest
*

View File

@@ -0,0 +1,26 @@
<?php
namespace Tests\Feature\Utils\InfluxDB;
use App\Exceptions\InfluxDBNotEnabledException;
use App\Utils\InfluxDB\InfluxDB;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Foundation\Testing\WithFaker;
use Tests\TestCase;
class InfluxDBWrapperWrapperTest extends TestCase
{
use RefreshDatabase;
/**
* Test it throws the right exception.
*
* @return void
*/
public function test_it_throws_excetpion_when_it_is_disabled()
{
$this->expectException(InfluxDBNotEnabledException::class);
InfluxDB::connect();
}
}

View File

@@ -0,0 +1,59 @@
<?php
namespace Tests\Mocks;
use App\Exceptions\SpeedtestFailureException;
use App\Interfaces\SpeedtestProvider;
use App\Models\Speedtest;
use Exception;
class OoklaTesterMocker implements SpeedtestProvider
{
private bool $passes;
public function __construct(bool $passes = true)
{
$this->passes = $passes;
}
public function run($output = null): Speedtest
{
$output = $output ?? $this->output();
try {
$output = json_decode($output, true, 512, JSON_THROW_ON_ERROR);
} catch (Exception $e) {
throw new SpeedtestFailureException();
}
return $this->passes
? Speedtest::factory()->create()
: Speedtest::factory()->create([
'download' => 0,
'upload' => 0,
'ping' => 0,
'failed' => true,
]);
}
public function output()
{
return !$this->passes
? null
: json_encode([
'type' => 'result',
'download' => ['bandwidth' => '50'],
'upload' => ['bandwidth' => '50'],
'ping' => ['latency' => '50'],
'server' => [
'id' => '1',
'name' => 'PHPUnit',
'host' => 'phpunit',
'port' => '443',
],
'result' => [
'url' => 'some-url',
]
]);
}
}

View File

@@ -3,7 +3,7 @@
namespace Tests\Unit\Controllers\SpeedtestController;
use App\Http\Controllers\SpeedtestController;
use App\Speedtest;
use App\Models\Speedtest;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;

View File

@@ -3,7 +3,7 @@
namespace Tests\Unit\Controllers\SpeedtestController;
use App\Http\Controllers\SpeedtestController;
use App\Speedtest;
use App\Models\Speedtest;
use DB;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;

View File

@@ -4,7 +4,7 @@ namespace Tests\Unit\Helpers\SpeedtestHelper;
use App\Helpers\SettingsHelper;
use App\Helpers\SpeedtestHelper;
use App\Speedtest;
use App\Models\Speedtest;
use Illuminate\Foundation\Testing\RefreshDatabase;
use InvalidArgumentException;
use Tests\TestCase;

View File

@@ -4,6 +4,7 @@ namespace Tests\Unit\Helpers\SpeedtestHelper;
use App\Utils\OoklaTester;
use PHPUnit\Framework\TestCase;
use Tests\Mocks\OoklaTesterMocker;
class CheckOutputTest extends TestCase
{
@@ -12,6 +13,7 @@ class CheckOutputTest extends TestCase
public function setUp(): void
{
$this->speedtestProvider = new OoklaTester();
$this->mocker = new OoklaTesterMocker();
}
/**

View File

@@ -3,7 +3,7 @@
namespace Tests\Unit\Helpers\SpeedtestHelper;
use App\Helpers\SpeedtestHelper;
use App\Speedtest;
use App\Models\Speedtest;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;

View File

@@ -4,7 +4,7 @@ namespace Tests\Unit\Helpers\SpeedtestHelper;
use App\Helpers\SettingsHelper;
use App\Helpers\SpeedtestHelper;
use App\Speedtest;
use App\Models\Speedtest;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;

View File

@@ -6,6 +6,7 @@ use App\Exceptions\SpeedtestFailureException;
use App\Helpers\SpeedtestHelper;
use App\Utils\OoklaTester;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\Mocks\OoklaTesterMocker;
use Tests\TestCase;
class SpeedtestTest extends TestCase
@@ -22,17 +23,7 @@ class SpeedtestTest extends TestCase
$this->speedtestProvider = new OoklaTester();
$this->output = $this->speedtestProvider->output();
}
/**
* A basic unit test example.
*
* @return void
*/
public function testOutputFunction()
{
$this->assertJson($this->output);
$this->output = (new OoklaTesterMocker())->output();
}
/**

View File

@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestCompleteListener;
use App\Helpers\SettingsHelper;
use App\Listeners\SpeedtestCompleteListener;
use App\Speedtest;
use App\Models\Speedtest;
use Exception;
use Illuminate\Foundation\Testing\RefreshDatabase;
use stdClass;

View File

@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestCompleteListener;
use App\Helpers\SettingsHelper;
use App\Listeners\SpeedtestCompleteListener;
use App\Speedtest;
use App\Models\Speedtest;
use Exception;
use Illuminate\Foundation\Testing\RefreshDatabase;
use stdClass;

View File

@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestFailedListener;
use App\Helpers\SettingsHelper;
use App\Listeners\SpeedtestFailedListener;
use App\Speedtest;
use App\Models\Speedtest;
use Exception;
use Illuminate\Foundation\Testing\RefreshDatabase;
use stdClass;

View File

@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestFailedListener;
use App\Helpers\SettingsHelper;
use App\Listeners\SpeedtestFailedListener;
use App\Speedtest;
use App\Models\Speedtest;
use Exception;
use Illuminate\Foundation\Testing\RefreshDatabase;
use stdClass;

View File

@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestOverviewListener;
use App\Helpers\SettingsHelper;
use App\Listeners\SpeedtestOverviewListener;
use App\Speedtest;
use App\Models\Speedtest;
use Exception;
use Illuminate\Foundation\Testing\RefreshDatabase;
use stdClass;

View File

@@ -4,7 +4,7 @@ namespace Tests\Unit\Listeners\SpeedtestOverviewListener;
use App\Helpers\SettingsHelper;
use App\Listeners\SpeedtestOverviewListener;
use App\Speedtest;
use App\Models\Speedtest;
use Exception;
use Illuminate\Foundation\Testing\RefreshDatabase;
use stdClass;