Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions lib/clients/dio_http.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import 'dart:io';

import 'package:dio/browser.dart';
import 'package:dio/dio.dart';
import 'package:dio/io.dart';
import 'package:enum_to_string/enum_to_string.dart';
import 'package:flutter/foundation.dart';
import 'package:robust_http/clients/base_http.dart';
import 'package:robust_http/exceptions.dart';
import 'package:robust_http/file_info.dart';
Expand Down Expand Up @@ -44,6 +47,20 @@ class DioHttp extends BaseHttp {
}

_dio = new Dio(baseOptions);
HttpClientAdapter adapter;
if (kIsWeb) {
adapter = BrowserHttpClientAdapter();
} else {
final client = HttpClient()
..idleTimeout = Duration(seconds: options["idleTimeout"] ?? 3);

if (options["maxConnectionsPerHost"] != null) {
client.maxConnectionsPerHost = options["maxConnectionsPerHost"];
}
adapter = IOHttpClientAdapter()
..createHttpClient = () => client;
}
_dio.httpClientAdapter = adapter;
var logLevel = options['logLevel'];
if (logLevel != 'none') {
_dio.interceptors.add(LoggerInterceptor(logLevel == 'debug'));
Expand All @@ -54,10 +71,10 @@ class DioHttp extends BaseHttp {
Future<void> handleException(error) async {
if (await validateConnectionError(
validateNetwork: _validateNetworkOnError)) {
if (error is DioError) {
if (error.type == DioErrorType.connectionTimeout ||
error.type == DioErrorType.sendTimeout ||
error.type == DioErrorType.receiveTimeout) {
if (error is DioException) {
if (error.type == DioExceptionType.connectionTimeout ||
error.type == DioExceptionType.sendTimeout ||
error.type == DioExceptionType.receiveTimeout) {
throw NetworkTimeoutException(
'Request ${error.requestOptions.path} timeout [${error.response?.statusCode}] ${error.message}');
} else if (error.response != null) {
Expand Down
2 changes: 1 addition & 1 deletion lib/robust_log.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class LoggerInterceptor extends Interceptor {

@override
void onError(
DioError err,
DioException err,
ErrorInterceptorHandler handler,
) async {
logMessages.add('*** DioError ***:');
Expand Down
8 changes: 4 additions & 4 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ dependencies:
flutter:
sdk: flutter
intl: ^0.18.1
connectivity_plus: ^4.0.1
logger: ^1.3.0
dio: ^5.1.2
http: ^1.0.0
connectivity_plus: ^5.0.2
logger: ^2.0.2+1
dio: ^5.4.0
http: ^1.1.2
enum_to_string: ^2.0.1
singleton: ^0.0.3-nullsafety
internet_connection_checker: ^1.0.0+1
Expand Down