NattyNarwhal
commented
7 months ago I have a preliminary patch for this:
diff --git a/Submariner/SBClientController.swift b/Submariner/SBClientController.swift
index 596b80c..20f3616 100644
--- a/Submariner/SBClientController.swift
+++ b/Submariner/SBClientController.swift
@@ -49,6 +49,29 @@ fileprivate let logger = Logger(subsystem: Bundle.main.bundleIdentifier!, catego
if response.statusCode == 404 {
self.server.markNotSupported(feature: type)
return
+ } else if response.statusCode == 429 {
+ // Newer versions of Navidrome back getCoverArt w/ third-party APIs.
+ // As such, it rate limits API requests that can invoke them.
+ // Instead of bothering the user, retry the request later.
+
+ // Retry-After is seconds or a specific date
+ let retryAfter = response.value(forHTTPHeaderField: "Retry-After")
+ logger.info("Retrying w/ Retry-After value \(retryAfter ?? "<nil>")")
+
+ if let retryAfter = retryAfter,
+ let specificDate = retryAfter.dateTimeFromHTTP() {
+ _ = Timer(fire: specificDate, interval: 0, repeats: false) { timer in
+ self.request(url: url, type: type, customization: customization)
+ timer.invalidate()
+ }
+ } else if let retryAfter = retryAfter {
+ let seconds = TimeInterval(retryAfter) ?? 5
+ _ = Timer(timeInterval: seconds, repeats: false) { timer in
+ self.request(url: url, type: type, customization: customization)
+ timer.invalidate()
+ }
+ }
+ return
} else if response.statusCode != 200 {
let message = "HTTP \(response.statusCode) for \(url.path)"
let userInfo = [NSLocalizedDescriptionKey: message]
diff --git a/Submariner/String+Time.swift b/Submariner/String+Time.swift
index 3544ea1..9653767 100644
--- a/Submariner/String+Time.swift
+++ b/Submariner/String+Time.swift
@@ -18,6 +18,13 @@ extension String {
formatter.locale = Locale(identifier: "en_US_POSIX")
return formatter
}()
+ fileprivate static let httpDateFormatter: DateFormatter = {
+ let formatter = DateFormatter()
+ formatter.dateFormat = "EEE', 'dd' 'MMM' 'yyyy' 'hh:mm:ss' GMT'"
+ formatter.timeZone = TimeZone(secondsFromGMT: 0)
+ formatter.locale = Locale(identifier: "en_US_POSIX")
+ return formatter
+ }()
static let componentFormatter: DateComponentsFormatter = {
let formatter = DateComponentsFormatter()
@@ -34,6 +41,10 @@ extension String {
return String.rfc3339DateFormatter.date(from: self as String)
}
+ func dateTimeFromHTTP() -> Date? {
+ return String.httpDateFormatter.date(from: self)
+ }
+
init(timeInterval: TimeInterval) {
if timeInterval == 0 || timeInterval.isNaN {
self = "00:00"If you want, I can provide a binary build of this against the current development snapshot for you to test. I haven't tested it yet, I'm still on older Navidrome here.
lukstei
Describe the bug When I connect to my Navidrome instance, which has a lot of songs, after a few seconds the rate limiting kicks in and causes errors in the requests, which shows an alert for each request and makes the application completely unusable.
Navidrome introduced rate limiting because of performance and rate limiting issues on external APIs, when too much album images are requested, see https://github.com/navidrome/navidrome/issues/2130 and related settings https://github.com/navidrome/navidrome/blob/bcab3cc0f908a01ebb99f9f6d0bfb37fadbd95bf/conf/configuration.go#L86-L88. The rate limiting is enabled by default.
To Reproduce Steps to reproduce the behavior:
Expected behavior Application should still be usable, and respect the rate limiting (if possible). Maybe the 429s can just be ignored for now.
Screenshots https://github.com/SubmarinerApp/Submariner/assets/292363/403b0998-104f-4e2d-9167-16cec8a631ce
Versions:
Additional context Add any other context about the problem here.