luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-04-28 17:48:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issue updating lists

Browse source
This commit is contained in:
Juan Gilsanz Polo 2022-10-13 00:13:49 +02:00
parent 50685d1ea8
commit f5b0648496
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/services/http_requests.dart
View file

@ -22,14 +22,16 @@ Future<Map<String, dynamic>> apiRequest({
required String urlPath, required String urlPath,
dynamic body, dynamic body,
required String type, required String type,
bool? overrideTimeout,
}) async { }) async {
try { try {
HttpClient httpClient = HttpClient(); HttpClient httpClient = HttpClient();
if (method == 'get') { if (method == 'get') {
HttpClientRequest request = await httpClient.getUrl(Uri.parse("${server.connectionMethod}://${server.domain}${server.path ?? ""}${server.port != null ? ':${server.port}' : ""}/control$urlPath")); HttpClientRequest request = await httpClient.getUrl(Uri.parse("${server.connectionMethod}://${server.domain}${server.path ?? ""}${server.port != null ? ':${server.port}' : ""}/control$urlPath"));
request.headers.set('authorization', 'Basic ${server.authToken}'); request.headers.set('authorization', 'Basic ${server.authToken}');
HttpClientResponse response = await request.close().timeout(const Duration(seconds: 10)); HttpClientResponse response = overrideTimeout == true
response.timeout(const Duration(seconds: 10)); ? await request.close()
: await request.close().timeout(const Duration(seconds: 10));
String reply = await response.transform(utf8.decoder).join(); String reply = await response.transform(utf8.decoder).join();
httpClient.close(); httpClient.close();
if (response.statusCode == 200) { if (response.statusCode == 200) {
@ -54,7 +56,9 @@ Future<Map<String, dynamic>> apiRequest({
request.headers.set('authorization', 'Basic ${server.authToken}'); request.headers.set('authorization', 'Basic ${server.authToken}');
request.headers.set('content-type', 'application/json'); request.headers.set('content-type', 'application/json');
request.add(utf8.encode(json.encode(body))); request.add(utf8.encode(json.encode(body)));
HttpClientResponse response = await request.close().timeout(const Duration(seconds: 10)); HttpClientResponse response = overrideTimeout == true
? await request.close()
: await request.close().timeout(const Duration(seconds: 10));
String reply = await response.transform(utf8.decoder).join(); String reply = await response.transform(utf8.decoder).join();
httpClient.close(); httpClient.close();
if (response.statusCode == 200) { if (response.statusCode == 200) {
@ -80,6 +84,7 @@ Future<Map<String, dynamic>> apiRequest({
} on SocketException { } on SocketException {
return { return {
'result': 'no_connection', 'result': 'no_connection',
'message': 'SocketException',
'log': AppLog( 'log': AppLog(
type: type, type: type,
dateTime: DateTime.now(), dateTime: DateTime.now(),
@ -89,6 +94,7 @@ Future<Map<String, dynamic>> apiRequest({
} on TimeoutException { } on TimeoutException {
return { return {
'result': 'no_connection', 'result': 'no_connection',
'message': 'TimeoutException',
'log': AppLog( 'log': AppLog(
type: type, type: type,
dateTime: DateTime.now(), dateTime: DateTime.now(),
@ -102,12 +108,13 @@ Future<Map<String, dynamic>> apiRequest({
'log': AppLog( 'log': AppLog(
type: type, type: type,
dateTime: DateTime.now(), dateTime: DateTime.now(),
message: 'TimeoutException' message: 'HandshakeException'
) )
}; };
} catch (e) { } catch (e) {
return { return {
'result': 'error', 'result': 'error',
'message': e.toString(),
'log': AppLog( 'log': AppLog(
type: type, type: type,
dateTime: DateTime.now(), dateTime: DateTime.now(),
@ -947,14 +954,16 @@ Future updateLists({
method: 'post', method: 'post',
server: server, server: server,
body: {'whitelist': true}, body: {'whitelist': true},
type: 'update_lists' type: 'update_lists',
overrideTimeout: true
), ),
apiRequest( apiRequest(
urlPath: '/filtering/refresh', urlPath: '/filtering/refresh',
method: 'post', method: 'post',
server: server, server: server,
body: {'whitelist': false}, body: {'whitelist': false},
type: 'update_lists' type: 'update_lists',
overrideTimeout: true
), ),
]); ]);
@ -984,7 +993,7 @@ Future updateLists({
'log': AppLog( 'log': AppLog(
type: 'update_lists', type: 'update_lists',
dateTime: DateTime.now(), dateTime: DateTime.now(),
message: [result[0]['log'].message, result[1]['log'].message].toString(), message: [result[0]['message'], result[1]['message']].toString(),
statusCode: result.map((res) => res['statusCode'] ?? 'null').toString(), statusCode: result.map((res) => res['statusCode'] ?? 'null').toString(),
resBody: result.map((res) => res['body'] ?? 'null').toString(), resBody: result.map((res) => res['body'] ?? 'null').toString(),
) )