Skip to content
Merged
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
9 changes: 8 additions & 1 deletion lib/extensions/uri.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ extension AddParameters on Uri {
newParameters[key] = value;
});

return buildUrlString(paramUrl, newParameters).toUri();
String finalUrl = buildUrlString(paramUrl, newParameters);

// Preserve the fragment if it exists
if (fragment.isNotEmpty) {
finalUrl += '#$fragment';
}

return finalUrl.toUri();
}
}
4 changes: 2 additions & 2 deletions lib/http/intercepted_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ class InterceptedClient extends BaseClient {
_retryCount += 1;
await Future.delayed(retryPolicy!
.delayRetryAttemptOnResponse(retryAttempt: _retryCount));
return _attemptRequest(request);
return _attemptRequest(request, isStream: isStream);
}
} on Exception catch (error) {
if (retryPolicy != null &&
Expand All @@ -302,7 +302,7 @@ class InterceptedClient extends BaseClient {
_retryCount += 1;
await Future.delayed(retryPolicy!
.delayRetryAttemptOnException(retryAttempt: _retryCount));
return _attemptRequest(request);
return _attemptRequest(request, isStream: isStream);
} else {
rethrow;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/models/retry_policy.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ abstract class RetryPolicy {
FutureOr<bool> shouldAttemptRetryOnResponse(BaseResponse response) => false;

/// Number of maximum request attempts that can be retried.
final int maxRetryAttempts = 1;
int get maxRetryAttempts => 1;

Duration delayRetryAttemptOnException({required int retryAttempt}) =>
Duration.zero;
Expand Down
19 changes: 18 additions & 1 deletion test/models/retry_policy_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ main() {
test("defaults to 1", () {
expect(testObject.maxRetryAttempts, 1);
});

test("can be overridden", () {
testObject = TestRetryPolicy(
maxRetryAttempts: 5,
);

expect(testObject.maxRetryAttempts, 5);
});
});

group("delayRetryAttemptOnException", () {
Expand Down Expand Up @@ -60,4 +68,13 @@ main() {
});
}

class TestRetryPolicy extends RetryPolicy {}
class TestRetryPolicy extends RetryPolicy {
TestRetryPolicy({
int maxRetryAttempts = 1,
}) : internalMaxRetryAttempts = maxRetryAttempts;

final int internalMaxRetryAttempts;

@override
int get maxRetryAttempts => internalMaxRetryAttempts;
}
Loading