Merge branch 'main' into debug/blank-timeline

mobile/lib/domain/services/timeline.service.dart

@@ -10,6 +10,7 @@ import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';
+import 'package:logging/logging.dart';
 
 typedef TimelineAssetSource = Future<List<BaseAsset>> Function(int index, int count);
 
@@ -90,6 +91,7 @@ class TimelineFactory {
 }
 
 class TimelineService {
+  static final Logger _log = Logger('TimelineService');
   final TimelineAssetSource _assetSource;
   final TimelineBucketSource _bucketSource;
   final TimelineOrigin origin;
@@ -105,34 +107,49 @@ class TimelineService {
     : this._(assetSource: query.assetSource, bucketSource: query.bucketSource, origin: query.origin);
 
   TimelineService._({required this._assetSource, required this._bucketSource, required this.origin}) {
-    _bucketSubscription = _bucketSource().listen((buckets) {
-      _mutex.run(() async {
-        final totalAssets = buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
+    _bucketSubscription = _bucketSource().listen(
+      (buckets) {
+        _mutex.run(() async {
+          try {
+            final totalAssets = buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
 
-        if (totalAssets == 0) {
-          _bufferOffset = 0;
-          _buffer = [];
-        } else {
-          final int offset;
-          final int count;
-          // When the buffer is empty or the old bufferOffset is greater than the new total assets,
-          // we need to reset the buffer and load the first batch of assets.
-          if (_bufferOffset >= totalAssets || _buffer.isEmpty) {
-            offset = 0;
-            count = kTimelineAssetLoadBatchSize;
-          } else {
-            offset = _bufferOffset;
-            count = math.min(_buffer.length, totalAssets - _bufferOffset);
+            _log.info(
+              '[$origin] bucket emission: ${buckets.length} buckets / $totalAssets assets '
+              '(current _totalAssets=$_totalAssets, _bufferOffset=$_bufferOffset, _buffer=${_buffer.length})',
+            );
+
+            if (totalAssets == 0) {
+              _bufferOffset = 0;
+              _buffer = [];
+            } else {
+              final int offset;
+              final int count;
+              // When the buffer is empty or the old bufferOffset is greater than the new total assets,
+              // we need to reset the buffer and load the first batch of assets.
+              if (_bufferOffset >= totalAssets || _buffer.isEmpty) {
+                offset = 0;
+                count = kTimelineAssetLoadBatchSize;
+              } else {
+                offset = _bufferOffset;
+                count = math.min(_buffer.length, totalAssets - _bufferOffset);
+              }
+              _buffer = await _assetSource(offset, count);
+              _bufferOffset = offset;
+              _log.info('[$origin] buffer reloaded: offset=$offset requested=$count got=${_buffer.length}');
+            }
+
+            _totalAssets = totalAssets;
+            EventStream.shared.emit(const TimelineReloadEvent());
+          } catch (error, stack) {
+            _log.severe('[$origin] bucket reload FAILED — _totalAssets stuck at $_totalAssets', error, stack);
+            rethrow;
           }
-          _buffer = await _assetSource(offset, count);
-          _bufferOffset = offset;
-        }
-
-        // change the state's total assets count only after the buffer is reloaded
-        _totalAssets = totalAssets;
-        EventStream.shared.emit(const TimelineReloadEvent());
-      });
-    });
+        });
+      },
+      onError: (Object error, StackTrace stack) {
+        _log.severe('[$origin] bucket stream errored', error, stack);
+      },
+    );
   }
 
   Stream<List<Bucket>> Function() get watchBuckets => _bucketSource;
@@ -164,6 +181,13 @@ class TimelineService {
     _buffer = await _assetSource(start, len);
     _bufferOffset = start;
 
+    if (!hasRange(index, count)) {
+      _log.warning(
+        '[$origin] _loadAssets($index, $count): buffer loaded (offset=$start, got=${_buffer.length}) but still '
+        'out of range — _totalAssets=$_totalAssets. getAssets is about to throw RangeError.',
+      );
+    }
+
     return getAssets(index, count);
   }
 

mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart

@@ -23,6 +23,7 @@ import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.da
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:logging/logging.dart';
 
 class FixedSegment extends Segment {
   final double tileHeight;
@@ -128,6 +129,13 @@ class _FixedSegmentRow extends ConsumerWidget {
         if (snapshot.connectionState != ConnectionState.done) {
           return _buildPlaceholder(context);
         }
+        if (snapshot.hasError) {
+          Logger('TimelineService').warning(
+            'render row loadAssets($assetIndex, $assetCount) failed (totalAssets=${timelineService.totalAssets})',
+            snapshot.error,
+            snapshot.stackTrace,
+          );
+        }
         return _buildAssetRow(context, snapshot.requireData, timelineService, isDynamicLayout);
       },
     );

mobile/lib/presentation/widgets/timeline/timeline.state.dart

@@ -7,6 +7,7 @@ import 'package:immich_mobile/presentation/widgets/timeline/fixed/segment_builde
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:logging/logging.dart';
 
 class TimelineArgs {
   final double maxWidth;
@@ -96,6 +97,11 @@ final timelineSegmentProvider = StreamProvider.autoDispose<List<Segment>>((ref)
 
   final timelineService = ref.watch(timelineServiceProvider);
   yield* timelineService.watchBuckets().map((buckets) {
+    final layoutTotal = buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);
+    Logger('TimelineService').info(
+      '[${timelineService.origin}] segment layout: ${buckets.length} buckets / $layoutTotal assets '
+      '(service.totalAssets=${timelineService.totalAssets})',
+    );
     return FixedSegmentBuilder(
       buckets: buckets,
       tileHeight: tileExtent,

mobile/lib/services/deep_link.service.dart

@@ -70,7 +70,10 @@ class DeepLinkService {
 
     if (assetRegex.hasMatch(path)) {
       final assetId = assetRegex.firstMatch(path)?.group(1) ?? '';
-      return _buildAssetDeepLink(assetId, ref);
+      // /albums/<albumId>/photos/<assetId> links carry the album context,
+      // which drives the like/comment UI in the viewer
+      final albumId = albumRegex.firstMatch(path)?.group(1);
+      return _buildAssetDeepLink(assetId, ref, albumId: albumId);
     }
     if (albumRegex.hasMatch(path)) {
       final albumId = albumRegex.firstMatch(path)?.group(1) ?? '';
@@ -107,16 +110,19 @@ class DeepLinkService {
     return DriftMemoryRoute(memories: memories, memoryIndex: 0);
   }
 
-  Future<PageRouteInfo?> _buildAssetDeepLink(String assetId, WidgetRef ref) async {
+  Future<PageRouteInfo?> _buildAssetDeepLink(String assetId, WidgetRef ref, {String? albumId}) async {
     final asset = await _betaAssetService.getRemoteAsset(assetId);
     if (asset == null) {
       return null;
     }
 
+    final album = albumId != null ? await _betaRemoteAlbumService.get(albumId) : null;
+
     AssetViewer.setAsset(ref, asset);
     return AssetViewerRoute(
       initialIndex: 0,
       timelineService: _betaTimelineFactory.fromAssets([asset], TimelineOrigin.deepLink),
+      currentAlbum: album,
     );
   }
 

mobile/test/services/deep_link_service_test.dart

@@ -0,0 +1,140 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/timeline.model.dart';
+import 'package:immich_mobile/domain/services/asset.service.dart';
+import 'package:immich_mobile/domain/services/memory.service.dart';
+import 'package:immich_mobile/domain/services/people.service.dart';
+import 'package:immich_mobile/domain/services/remote_album.service.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/services/deep_link.service.dart';
+import 'package:mocktail/mocktail.dart';
+
+class MockTimelineFactory extends Mock implements TimelineFactory {}
+
+class MockAssetService extends Mock implements AssetService {}
+
+class MockRemoteAlbumService extends Mock implements RemoteAlbumService {}
+
+class MockDriftMemoryService extends Mock implements DriftMemoryService {}
+
+class MockDriftPeopleService extends Mock implements DriftPeopleService {}
+
+class MockPlatformDeepLink extends Mock implements PlatformDeepLink {}
+
+class MockWidgetRef extends Mock implements WidgetRef {}
+
+class MockAssetViewerStateNotifier extends Mock implements AssetViewerStateNotifier {}
+
+const _assetId = 'aaaaaaaa-1111-2222-3333-bbbbbbbbbbbb';
+const _albumId = 'cccccccc-4444-5555-6666-dddddddddddd';
+
+final _asset = RemoteAsset(
+  id: _assetId,
+  name: 'photo.jpg',
+  ownerId: 'user-1',
+  checksum: 'checksum-1',
+  type: AssetType.image,
+  createdAt: DateTime(2026, 6, 12),
+  updatedAt: DateTime(2026, 6, 12),
+  isEdited: false,
+);
+
+final _album = RemoteAlbum(
+  id: _albumId,
+  name: 'Shared Album',
+  ownerId: 'user-1',
+  description: '',
+  createdAt: DateTime(2026, 6, 12),
+  updatedAt: DateTime(2026, 6, 12),
+  isActivityEnabled: true,
+  isShared: true,
+  order: AlbumAssetOrder.asc,
+  assetCount: 1,
+  ownerName: 'Owner',
+);
+
+void main() {
+  late MockTimelineFactory timelineFactory;
+  late MockAssetService assetService;
+  late MockRemoteAlbumService remoteAlbumService;
+  late MockWidgetRef ref;
+  late List<TimelineService> createdTimelineServices;
+  late DeepLinkService sut;
+
+  setUp(() {
+    timelineFactory = MockTimelineFactory();
+    assetService = MockAssetService();
+    remoteAlbumService = MockRemoteAlbumService();
+    ref = MockWidgetRef();
+    createdTimelineServices = [];
+
+    when(() => timelineFactory.fromAssets(any(), TimelineOrigin.deepLink)).thenAnswer((invocation) {
+      final assets = List<BaseAsset>.from(invocation.positionalArguments[0] as List<BaseAsset>);
+      final timelineService = TimelineService((
+        assetSource: (index, count) async => assets.skip(index).take(count).toList(),
+        bucketSource: () => Stream.value([Bucket(assetCount: assets.length)]),
+        origin: TimelineOrigin.deepLink,
+      ));
+      createdTimelineServices.add(timelineService);
+      return timelineService;
+    });
+
+    when(() => ref.read(assetViewerProvider.notifier)).thenReturn(MockAssetViewerStateNotifier());
+
+    sut = DeepLinkService(
+      timelineFactory,
+      assetService,
+      remoteAlbumService,
+      MockDriftMemoryService(),
+      MockDriftPeopleService(),
+      null,
+    );
+
+    addTearDown(() async {
+      for (final timelineService in createdTimelineServices) {
+        await timelineService.dispose();
+      }
+    });
+  });
+
+  PlatformDeepLink link(String path) {
+    final deepLink = MockPlatformDeepLink();
+    when(() => deepLink.uri).thenReturn(Uri.parse('https://my.immich.app$path'));
+    return deepLink;
+  }
+
+  test('album photo link carries the album into the viewer route', () async {
+    when(() => assetService.getRemoteAsset(_assetId)).thenAnswer((_) async => _asset);
+    when(() => remoteAlbumService.get(_albumId)).thenAnswer((_) async => _album);
+
+    final route = await sut.handleMyImmichApp(link('/albums/$_albumId/photos/$_assetId'), ref);
+
+    expect(route, isA<AssetViewerRoute>());
+    expect((route!.args as AssetViewerRouteArgs).currentAlbum, _album);
+  });
+
+  test('still opens the viewer when the album cannot be resolved', () async {
+    when(() => assetService.getRemoteAsset(_assetId)).thenAnswer((_) async => _asset);
+    when(() => remoteAlbumService.get(_albumId)).thenAnswer((_) async => null);
+
+    final route = await sut.handleMyImmichApp(link('/albums/$_albumId/photos/$_assetId'), ref);
+
+    expect(route, isA<AssetViewerRoute>());
+    expect((route!.args as AssetViewerRouteArgs).currentAlbum, isNull);
+  });
+
+  test('plain photo link has no album', () async {
+    when(() => assetService.getRemoteAsset(_assetId)).thenAnswer((_) async => _asset);
+
+    final route = await sut.handleMyImmichApp(link('/photos/$_assetId'), ref);
+
+    expect(route, isA<AssetViewerRoute>());
+    expect((route!.args as AssetViewerRouteArgs).currentAlbum, isNull);
+    verifyNever(() => remoteAlbumService.get(any()));
+  });
+}

web/src/lib/constants.ts

@@ -69,7 +69,7 @@ export enum OpenQueryParam {
   PURCHASE_SETTINGS = 'user-purchase-settings',
 }
 
-export const maximumLengthSearchPeople = 1000;
+export const maximumLengthSearchPeople = 100;
 
 // time to load the map before displaying the loading spinner
 export const timeToLoadTheMap: number = 100;