luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-04 20:30:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added get server status

Browse source
This commit is contained in:
Juan Gilsanz Polo 2022-09-27 12:43:25 +02:00
parent 97e4fea015
commit 4ab8ff760c
5 changed files with 81 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/models/server_status.dart Normal file
View file

@ -0,0 +1,28 @@
import 'package:adguard_home_manager/models/dns_statistics.dart';
class ServerStatus {
final DnsStatistics stats;
final bool generalEnabled;
final bool filteringEnabled;
final bool safeSearchEnabled;
final bool safeBrowsingEnabled;
final bool parentalControlEnabled;
const ServerStatus({
required this.stats,
required this.generalEnabled,
required this.filteringEnabled,
required this.safeSearchEnabled,
required this.safeBrowsingEnabled,
required this.parentalControlEnabled
});
factory ServerStatus.fromJson(Map<String, dynamic> json) => ServerStatus(
stats: DnsStatistics.fromJson(json['stats']),
generalEnabled: json['generalEnabled']['protection_enabled'],
filteringEnabled: json['filteringEnabled']['enabled'],
safeSearchEnabled: json['safeSearchEnabled']['enabled'],
safeBrowsingEnabled: json['safeBrowsingEnabled']['enabled'],
parentalControlEnabled: json['parentalControlEnabled']['enabled']
);
}

17
lib/providers/servers_provider.dart
View file

@ -1,4 +1,5 @@
import 'package:adguard_home_manager/models/dns_statistics.dart';
import 'package:adguard_home_manager/models/server_status.dart';
import 'package:adguard_home_manager/services/http_requests.dart';
import 'package:flutter/material.dart';
import 'package:sqflite/sqflite.dart';
@ -12,7 +13,7 @@ class ServersProvider with ChangeNotifier {
List<Server> _serversList = [];
Server? _selectedServer;
bool? _isServerConnected;
DnsStatistics? _dnsStatistics;
ServerStatus? _serverStatus;
List<Server> get serversList {
return _serversList;
@ -26,8 +27,8 @@ class ServersProvider with ChangeNotifier {
return _isServerConnected;
}
DnsStatistics? get dnsStatistics {
return _dnsStatistics;
ServerStatus? get serverStatus {
return _serverStatus;
}
void setDbInstance(Database db) {
@ -49,8 +50,8 @@ class ServersProvider with ChangeNotifier {
notifyListeners();
}
void setDnsStatistics(DnsStatistics data) {
_dnsStatistics = data;
void setServerStatus(ServerStatus data) {
_serverStatus = data;
notifyListeners();
}
@ -208,9 +209,9 @@ class ServersProvider with ChangeNotifier {
_serversList.add(serverObj);
if (convertFromIntToBool(server['defaultServer']) == true) {
_selectedServer = serverObj;
final dnsStatistics = await getDnsStatistics(serverObj);
if (dnsStatistics['result'] == 'success') {
_dnsStatistics = dnsStatistics['data'];
final serverStatus = await getServerStatus(serverObj);
if (serverStatus['result'] == 'success') {
_serverStatus = serverStatus['data'];
_isServerConnected = true;
}
else {

47
lib/services/http_requests.dart
View file

@ -6,9 +6,19 @@ import 'dart:io';
import 'package:http/http.dart' as http;
import 'package:adguard_home_manager/models/server_status.dart';
import 'package:adguard_home_manager/models/dns_statistics.dart';
import 'package:adguard_home_manager/models/server.dart';
Future<http.Response> getRequest(String urlPath, Server server) {
return http.get(
Uri.parse("${server.connectionMethod}://${server.domain}${server.path ?? ""}${server.port != null ? ':${server.port}' : ""}/control$urlPath"),
headers: {
'Authorization': 'Basic ${server.authToken}'
}
);
}
Future login(Server server) async {
try {
final result = await http.post(
@ -47,18 +57,37 @@ Future login(Server server) async {
}
}
Future getDnsStatistics(Server server) async {
Future getServerStatus(Server server) async {
try {
final result = await http.get(
Uri.parse("${server.connectionMethod}://${server.domain}${server.path ?? ""}${server.port != null ? ':${server.port}' : ""}/control/stats"),
headers: {
'Authorization': 'Basic ${server.authToken}'
}
);
if (result.statusCode == 200) {
final result = await Future.wait([
getRequest('/stats', server),
getRequest('/status', server),
getRequest('/filtering/status', server),
getRequest('/safesearch/status', server),
getRequest('/safebrowsing/status', server),
getRequest('/parental/status', server),
]);
if (
result[0].statusCode == 200 &&
result[1].statusCode == 200 &&
result[2].statusCode == 200 &&
result[3].statusCode == 200 &&
result[4].statusCode == 200 &&
result[5].statusCode == 200
) {
final Map<String, dynamic> mappedData = {
'stats': jsonDecode(result[0].body),
'generalEnabled': jsonDecode(result[1].body),
'filteringEnabled': jsonDecode(result[2].body),
'safeSearchEnabled': jsonDecode(result[3].body),
'safeBrowsingEnabled': jsonDecode(result[4].body),
'parentalControlEnabled': jsonDecode(result[5].body),
};
return {
'result': 'success',
'data': DnsStatistics.fromJson(jsonDecode(result.body))
'data': ServerStatus.fromJson(mappedData)
};
}
else {

6
lib/widgets/add_server_modal.dart
View file

@ -225,9 +225,9 @@ class _AddServerModalState extends State<AddServerModal> {
serverObj.authToken = encodeBase64UserPass(serverObj.user, serverObj.password);
final serverCreated = await serversProvider.createServer(serverObj);
if (serverCreated == true) {
final dnsStatistics = await getDnsStatistics(serverObj);
if (dnsStatistics['result'] == 'success') {
serversProvider.setDnsStatistics(dnsStatistics['data']);
final serverStatus = await getServerStatus(serverObj);
if (serverStatus['result'] == 'success') {
serversProvider.setServerStatus(serverStatus['data']);
serversProvider.setIsServerConnected(true);
}
else {

6
lib/widgets/servers_list/servers_list.dart
View file

@ -62,9 +62,9 @@ class ServersList extends StatelessWidget {
if (result['result'] == 'success') {
serversProvider.setSelectedServer(server);
final dnsStatistics = await getDnsStatistics(server);
if (dnsStatistics['result'] == 'success') {
serversProvider.setDnsStatistics(dnsStatistics['data']);
final serverStatus = await getServerStatus(server);
if (serverStatus['result'] == 'success') {
serversProvider.setServerStatus(serverStatus['data']);
serversProvider.setIsServerConnected(true);
}
else {