chore: code review changes from @shenlong-tanwen

mobile/ios/WidgetExtension/ImmichAPI.swift

@@ -17,6 +17,14 @@ enum AssetType: String, Codable {
   case other = "OTHER"
 }
 
+struct ServerWellKnown: Codable {
+  struct APIInfo: Codable{
+    let endpoint: String
+  }
+  
+  let api: APIInfo
+}
+
 struct SearchResult: Codable {
   let id: String
   let type: AssetType
@@ -57,7 +65,7 @@ class ImmichAPI {
   init() async throws {
     // fetch the credentials from the UserDefaults store that dart placed here
     guard let defaults = UserDefaults(suiteName: "group.app.immich.share"),
-      let serverURL = defaults.string(forKey: "widget_server_url"),
+      var serverURL = defaults.string(forKey: "widget_server_url"),
       let sessionKey = defaults.string(forKey: "widget_auth_token")
     else {
       throw WidgetError.noLogin
@@ -66,13 +74,55 @@ class ImmichAPI {
     if serverURL == "" || sessionKey == "" {
       throw WidgetError.noLogin
     }
-
+        
-    serverConfig = ServerConfig(
+    // migrate the server list value to a JSON array if it is not already
-      serverEndpoint: serverURL,
+    if !serverURL.starts(with: "[") {
-      sessionKey: sessionKey
+      let newServerList = "[\"\(serverURL)\"]"
-    )
+      defaults.set(newServerList, forKey: "widget_server_url")
+      serverURL = newServerList
+    }
+        
+    guard let urls = try? JSONDecoder().decode([String].self, from: serverURL.data(using: .utf8)!) else {
+      throw WidgetError.noLogin
+    }
+    
+    for url in urls {
+      guard let endpointURL = URL(string: url) else { continue }
+      
+      if let apiURL = await Self.validateServer(at: endpointURL) {
+        serverConfig = ServerConfig(
+          serverEndpoint: apiURL.absoluteString,
+          sessionKey: sessionKey
+        )
+        return
+      }
+    }
+    
+    throw WidgetError.fetchFailed
   }
 
+  private static func validateServer(at endpointURL: URL) async -> URL? {
+    // build a URL that is only scheme, host, and port
+    var components = URLComponents()
+    components.scheme = endpointURL.scheme
+    components.host = endpointURL.host
+    components.port = endpointURL.port
+
+    guard let baseURL = components.url else { return nil }
+    
+    var pingURL = baseURL
+    pingURL.appendPathComponent(".well-known")
+    pingURL.appendPathComponent("immich")
+    
+    guard let (serverPingJSON, _) = try? await URLSession.shared.data(from: pingURL) else { return nil }
+    guard let apiInfo = try? JSONDecoder().decode(ServerWellKnown.self, from: serverPingJSON) else {  return nil }
+    
+    var apiURL = baseURL
+    apiURL.appendPathComponent(apiInfo.api.endpoint)
+    
+    return apiURL
+  }
+  
   private func buildRequestURL(
     serverConfig: ServerConfig,
     endpoint: String,

mobile/ios/WidgetExtension/widgets/MemoryWidget.swift

@@ -20,8 +20,11 @@ struct ImmichMemoryProvider: TimelineProvider {
     completion: @escaping @Sendable (ImageEntry) -> Void
   ) {
     Task {
-      guard let api = try? await ImmichAPI() else {
+      var api: ImmichAPI
-        completion(ImageEntry(date: Date(), image: nil, error: .noLogin))
+      do {
+        api = try await ImmichAPI()
+      } catch let error as WidgetError {
+        completion(ImageEntry(date: Date(), image: nil, error: error))
         return
       }
 
@@ -79,9 +82,13 @@ struct ImmichMemoryProvider: TimelineProvider {
     Task {
       var entries: [ImageEntry] = []
       let now = Date()
-
+      
-      guard let api = try? await ImmichAPI() else {
+      
-        entries.append(ImageEntry(date: now, image: nil, error: .noLogin))
+      var api: ImmichAPI
+      do {
+        api = try await ImmichAPI()
+      } catch let error as WidgetError {
+        entries.append(ImageEntry(date: now, image: nil, error: error))
         completion(Timeline(entries: entries, policy: .atEnd))
         return
       }

mobile/ios/WidgetExtension/widgets/RandomWidget.swift

@@ -63,10 +63,15 @@ struct ImmichRandomProvider: AppIntentTimelineProvider {
   ) async
     -> ImageEntry
   {
-    guard let api = try? await ImmichAPI() else {
+    var api: ImmichAPI
-      return ImageEntry(date: Date(), image: nil, error: .noLogin)
+    do {
+      api = try await ImmichAPI()
+    } catch let error as WidgetError {
+      return ImageEntry(date: Date(), image: nil, error: error)
+    } catch {
+      return ImageEntry(date: Date(), image: nil, error: .fetchFailed)
     }
-
+    
     guard
       let randomImage = try? await api.fetchSearchResults(
         with: SearchFilters(size: 1)
@@ -100,15 +105,21 @@ struct ImmichRandomProvider: AppIntentTimelineProvider {
     let now = Date()
 
     // If we don't have a server config, return an entry with an error
-    guard let api = try? await ImmichAPI() else {
+    var api: ImmichAPI
-      entries.append(ImageEntry(date: now, image: nil, error: .noLogin))
+    do {
+      api = try await ImmichAPI()
+    } catch let error as WidgetError {
+      entries.append(ImageEntry(date: now, image: nil, error: error))
+      return Timeline(entries: entries, policy: .atEnd)
+    } catch {
+      entries.append(ImageEntry(date: now, image: nil, error: .fetchFailed))
       return Timeline(entries: entries, policy: .atEnd)
     }
 
     // nil if album is NONE or nil
     let albumId =
       configuration.album?.id != "NONE" ? configuration.album?.id : nil
-    var albumName: String? = albumId != nil ? configuration.album?.albumName : nil
+    let albumName: String? = albumId != nil ? configuration.album?.albumName : nil
     
     if albumId != nil {
       // make sure the album exists on server, otherwise show error

mobile/lib/providers/auth.provider.dart

@@ -118,10 +118,8 @@ class AuthNotifier extends StateNotifier<AuthState> {
   }) async {
     await _apiService.setAccessToken(accessToken);
 
-    await _widgetService.writeCredentials(
+    await _widgetService.writeSessionKey(accessToken);
-      Store.get(StoreKey.serverEndpoint),
+    await _widgetService.writeServerList();
-      accessToken,
-    );
 
     // Get the deviceid from the store if it exists, otherwise generate a new one
     String deviceId =
@@ -190,6 +188,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
 
   Future<void> saveLocalEndpoint(String url) async {
     await Store.put(StoreKey.localEndpoint, url);
+    await _widgetService.writeServerList();
   }
 
   String? getSavedWifiName() {

mobile/lib/services/widget.service.dart

@@ -1,31 +1,68 @@
+import 'dart:convert';
+
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/repositories/auth.repository.dart';
 import 'package:immich_mobile/repositories/widget.repository.dart';
 
 final widgetServiceProvider = Provider((ref) {
   return WidgetService(
     ref.watch(widgetRepositoryProvider),
+    ref.watch(authRepositoryProvider),
   );
 });
 
 class WidgetService {
-  final WidgetRepository _repository;
+  final WidgetRepository _widgetRepository;
+  final AuthRepository _authRepository;
 
-  WidgetService(this._repository);
+  WidgetService(this._widgetRepository, this._authRepository);
 
-  Future<void> writeCredentials(String serverURL, String sessionKey) async {
+  Future<void> writeSessionKey(
-    await _repository.setAppGroupId(appShareGroupId);
+    String sessionKey,
-    await _repository.saveData(kWidgetServerEndpoint, serverURL);
+  ) async {
-    await _repository.saveData(kWidgetAuthToken, sessionKey);
+    await _widgetRepository.setAppGroupId(appShareGroupId);
+    await _widgetRepository.saveData(kWidgetAuthToken, sessionKey);
 
     // wait 3 seconds to ensure the widget is updated, dont block
     Future.delayed(const Duration(seconds: 3), refreshWidgets);
   }
 
+  Future<void> writeServerList() async {
+    await _widgetRepository.setAppGroupId(appShareGroupId);
+
+    // create json string from serverURLS
+    final serverURLSString = jsonEncode(_buildServerList());
+
+    await _widgetRepository.saveData(kWidgetServerEndpoint, serverURLSString);
+    Future.delayed(const Duration(seconds: 3), refreshWidgets);
+  }
+
+  List<String> _buildServerList() {
+    final endpointList = _authRepository.getExternalEndpointList();
+
+    final String? localEndpoint = Store.tryGet(StoreKey.localEndpoint);
+    final String? serverUrl = Store.tryGet(StoreKey.serverUrl);
+
+    final List<String> serverUrlList = endpointList.map((e) => e.url).toList();
+
+    if (localEndpoint != null) {
+      serverUrlList.insert(0, localEndpoint);
+    }
+
+    if (serverUrl != null) {
+      serverUrlList.insert(0, serverUrl);
+    }
+
+    return serverUrlList.toSet().toList();
+  }
+
   Future<void> clearCredentials() async {
-    await _repository.setAppGroupId(appShareGroupId);
+    await _widgetRepository.setAppGroupId(appShareGroupId);
-    await _repository.saveData(kWidgetServerEndpoint, "");
+    await _widgetRepository.saveData(kWidgetServerEndpoint, "");
-    await _repository.saveData(kWidgetAuthToken, "");
+    await _widgetRepository.saveData(kWidgetAuthToken, "");
 
     // wait 3 seconds to ensure the widget is updated, dont block
     Future.delayed(const Duration(seconds: 3), refreshWidgets);
@@ -33,7 +70,7 @@ class WidgetService {
 
   Future<void> refreshWidgets() async {
     for (final name in kWidgetNames) {
-      await _repository.refresh(name);
+      await _widgetRepository.refresh(name);
     }
   }
 }

mobile/lib/widgets/settings/networking_settings/external_network_preference.dart

@@ -8,6 +8,7 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
+import 'package:immich_mobile/services/widget.service.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/endpoint_input.dart';
 
 class ExternalNetworkPreference extends HookConsumerWidget {
@@ -35,6 +36,8 @@ class ExternalNetworkPreference extends HookConsumerWidget {
         StoreKey.externalEndpointList,
         jsonString,
       );
+
+      ref.read(widgetServiceProvider).writeServerList();
     }
 
     updateValidationStatus(String url, int index, AuxCheckStatus status) {