merge main

2025-09-17 16:08:34 +05:30
parent f3e427f268 e6e8ae7c74
commit 379d9ab1e4
528 changed files with 17365 additions and 6390 deletions
@@ -1,11 +1,17 @@
 import 'dart:async';
+import 'dart:io';
 import 'dart:ui';

 import 'package:background_downloader/background_downloader.dart';
+import 'package:cancellation_token_http/http.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/utils/isolate_lock_manager.dart';
+import 'package:immich_mobile/domain/services/log.service.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/extensions/network_capability_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/generated/intl_keys.g.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
 import 'package:immich_mobile/platform/background_worker_api.g.dart';
@@ -14,16 +20,20 @@ import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
 import 'package:immich_mobile/services/localization.service.dart';
+import 'package:immich_mobile/services/server_info.service.dart';
 import 'package:immich_mobile/services/upload.service.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
+import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:isar/isar.dart';
 import 'package:logging/logging.dart';
+import 'package:worker_manager/worker_manager.dart';

 class BackgroundWorkerFgService {
  final BackgroundWorkerFgHostApi _foregroundHostApi;
@@ -42,8 +52,8 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
  final Drift _drift;
  final DriftLogger _driftLogger;
  final BackgroundWorkerBgHostApi _backgroundHostApi;
-  final Logger _logger = Logger('BackgroundUploadBgService');
-  late final IsolateLockManager _lockManager;
+  final CancellationToken _cancellationToken = CancellationToken();
+  final Logger _logger = Logger('BackgroundWorkerBgService');

  bool _isCleanedUp = false;

@@ -59,7 +69,6 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
        driftProvider.overrideWith(driftOverride(drift)),
      ],
    );
-    _lockManager = IsolateLockManager(onCloseRequest: _cleanup);
    BackgroundWorkerFlutterApi.setUp(this);
  }

@@ -67,41 +76,37 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {

  Future<void> init() async {
    try {
-      await loadTranslations();
      HttpSSLOptions.apply(applyNative: false);
-      await _ref.read(authServiceProvider).setOpenApiServiceEndpoint();

-      // Initialize the file downloader
-      await FileDownloader().configure(
-        globalConfig: [
-          // maxConcurrent: 6, maxConcurrentByHost(server):6, maxConcurrentByGroup: 3
-          (Config.holdingQueue, (6, 6, 3)),
-          // On Android, if files are larger than 256MB, run in foreground service
-          (Config.runInForegroundIfFileLargerThan, 256),
-        ],
-      );
-      await FileDownloader().trackTasksInGroup(kDownloadGroupLivePhoto, markDownloadedComplete: false);
-      await FileDownloader().trackTasks();
+      await Future.wait([
+        loadTranslations(),
+        workerManager.init(dynamicSpawning: true),
+        _ref.read(authServiceProvider).setOpenApiServiceEndpoint(),
+        // Initialize the file downloader
+        FileDownloader().configure(
+          globalConfig: [
+            // maxConcurrent: 6, maxConcurrentByHost(server):6, maxConcurrentByGroup: 3
+            (Config.holdingQueue, (6, 6, 3)),
+            // On Android, if files are larger than 256MB, run in foreground service
+            (Config.runInForegroundIfFileLargerThan, 256),
+          ],
+        ),
+        FileDownloader().trackTasksInGroup(kDownloadGroupLivePhoto, markDownloadedComplete: false),
+        FileDownloader().trackTasks(),
+        _ref.read(fileMediaRepositoryProvider).enableBackgroundAccess(),
+      ]);
+
      configureFileDownloaderNotifications();
-      await _ref.read(fileMediaRepositoryProvider).enableBackgroundAccess();

-      // Notify the host that the background upload service has been initialized and is ready to use
-      debugPrint("Acquiring background worker lock");
-      if (await _lockManager.acquireLock().timeout(
-        const Duration(seconds: 5),
-        onTimeout: () {
-          _lockManager.cancel();
-          return false;
-        },
-      )) {
-        _logger.info("Acquired background worker lock");
-        await _backgroundHostApi.onInitialized();
-        return;
+      if (Platform.isAndroid) {
+        await _backgroundHostApi.showNotification(
+          IntlKeys.uploading_media.t(),
+          IntlKeys.backup_background_service_in_progress_notification.t(),
+        );
      }

-      _logger.warning("Failed to acquire background worker lock");
-      await _cleanup();
-      await _backgroundHostApi.close();
+      // Notify the host that the background worker service has been initialized and is ready to use
+      _backgroundHostApi.onInitialized();
    } catch (error, stack) {
      _logger.severe("Failed to initialize background worker", error, stack);
      await _backgroundHostApi.close();
@@ -115,7 +120,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
      final sw = Stopwatch()..start();

      await _syncAssets(hashTimeout: Duration(minutes: _isBackupEnabled ? 3 : 6));
-      await _handleBackup(processBulk: false);
+      await _handleBackup();

      sw.stop();
      _logger.info("Android background processing completed in ${sw.elapsed.inSeconds}s");
@@ -157,7 +162,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
    try {
      await _cleanup();
    } catch (error, stack) {
-      debugPrint('Failed to cleanup background worker: $error with stack: $stack');
+      dPrint(() => 'Failed to cleanup background worker: $error with stack: $stack');
    }
  }

@@ -167,70 +172,96 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
    }

    try {
+      final backgroundSyncManager = _ref.read(backgroundSyncProvider);
      _isCleanedUp = true;
-      _logger.info("Cleaning up background worker");
-      await _ref.read(backgroundSyncProvider).cancel();
-      await _ref.read(backgroundSyncProvider).cancelLocal();
-      if (_isar.isOpen) {
-        await _isar.close();
-      }
-      await _drift.close();
-      await _driftLogger.close();
      _ref.dispose();
-      _lockManager.releaseLock();
+
+      _cancellationToken.cancel();
+      _logger.info("Cleaning up background worker");
+      final cleanupFutures = [
+        workerManager.dispose().catchError((_) async {
+          // Discard any errors on the dispose call
+          return;
+        }),
+        LogService.I.dispose(),
+        Store.dispose(),
+        _drift.close(),
+        _driftLogger.close(),
+        backgroundSyncManager.cancel(),
+        backgroundSyncManager.cancelLocal(),
+      ];
+
+      if (_isar.isOpen) {
+        cleanupFutures.add(_isar.close());
+      }
+      await Future.wait(cleanupFutures);
      _logger.info("Background worker resources cleaned up");
    } catch (error, stack) {
-      debugPrint('Failed to cleanup background worker: $error with stack: $stack');
+      dPrint(() => 'Failed to cleanup background worker: $error with stack: $stack');
    }
  }

-  Future<void> _handleBackup({bool processBulk = true}) async {
-    if (!_isBackupEnabled) {
-      return;
-    }
+  Future<void> _handleBackup() async {
+    await runZonedGuarded(
+      () async {
+        if (!_isBackupEnabled || _isCleanedUp) {
+          _logger.info("[_handleBackup 1] Backup is disabled. Skipping backup routine");
+          return;
+        }

-    final currentUser = _ref.read(currentUserProvider);
-    if (currentUser == null) {
-      return;
-    }
+        _logger.info("[_handleBackup 2] Enqueuing assets for backup from the background service");

-    if (processBulk) {
-      return _ref.read(driftBackupProvider.notifier).handleBackupResume(currentUser.id);
-    }
+        final currentUser = _ref.read(currentUserProvider);
+        if (currentUser == null) {
+          _logger.warning("[_handleBackup 3] No current user found. Skipping backup from background");
+          return;
+        }

-    final activeTask = await _ref.read(uploadServiceProvider).getActiveTasks(currentUser.id);
-    if (activeTask.isNotEmpty) {
-      await _ref.read(uploadServiceProvider).resumeBackup();
-    } else {
-      await _ref.read(uploadServiceProvider).startBackupSerial(currentUser.id);
-    }
+        _logger.info("[_handleBackup 4] Resume backup from background");
+        if (Platform.isIOS) {
+          return _ref.read(driftBackupProvider.notifier).handleBackupResume(currentUser.id);
+        }
+
+        final canPing = await _ref.read(serverInfoServiceProvider).ping();
+        if (!canPing) {
+          _logger.warning("[_handleBackup 5] Server is not reachable. Skipping backup from background");
+          return;
+        }
+
+        final networkCapabilities = await _ref.read(connectivityApiProvider).getCapabilities();
+
+        return _ref
+            .read(uploadServiceProvider)
+            .startBackupWithHttpClient(currentUser.id, networkCapabilities.hasWifi, _cancellationToken);
+      },
+      (error, stack) {
+        dPrint(() => "Error in backup zone $error, $stack");
+      },
+    );
  }

  Future<void> _syncAssets({Duration? hashTimeout}) async {
-    final futures = <Future<void>>[];
+    await _ref.read(backgroundSyncProvider).syncLocal();
+    if (_isCleanedUp) {
+      return;
+    }

-    final localSyncFuture = _ref.read(backgroundSyncProvider).syncLocal().then((_) async {
-      if (_isCleanedUp) {
-        return;
-      }
+    await _ref.read(backgroundSyncProvider).syncRemote();
+    if (_isCleanedUp) {
+      return;
+    }

-      var hashFuture = _ref.read(backgroundSyncProvider).hashAssets();
-      if (hashTimeout != null) {
-        hashFuture = hashFuture.timeout(
-          hashTimeout,
-          onTimeout: () {
-            // Consume cancellation errors as we want to continue processing
-          },
-        );
-      }
+    var hashFuture = _ref.read(backgroundSyncProvider).hashAssets();
+    if (hashTimeout != null) {
+      hashFuture = hashFuture.timeout(
+        hashTimeout,
+        onTimeout: () {
+          // Consume cancellation errors as we want to continue processing
+        },
+      );
+    }

-      return hashFuture;
-    });
-
-    futures.add(localSyncFuture);
-    futures.add(_ref.read(backgroundSyncProvider).syncRemote());
-
-    await Future.wait(futures);
+    await hashFuture;
  }
 }

@@ -242,6 +273,6 @@ Future<void> backgroundSyncNativeEntrypoint() async {
  DartPluginRegistrant.ensureInitialized();

  final (isar, drift, logDB) = await Bootstrap.initDB();
-  await Bootstrap.initDomain(isar, drift, logDB, shouldBufferLogs: false);
+  await Bootstrap.initDomain(isar, drift, logDB, shouldBufferLogs: false, listenStoreUpdates: false);
  await BackgroundWorkerBgService(isar: isar, drift: drift, driftLogger: logDB).init();
 }