fix: missing responsive calculation in UserPageLayout

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>

.github/workflows/build-mobile.yml

@@ -36,7 +36,7 @@ jobs:
     steps:
       - name: Check what should run
         id: check
-        uses: immich-app/devtools/actions/pre-job@24820aa4ef67959b0dcf69a438cccf00d7c7042b # pre-job-action-v1.0.1
+        uses: immich-app/devtools/actions/pre-job@5f91b52dfbb92b8d96ca411ab59c896cd59714ca # pre-job-action-v1.1.0
         with:
           filters: |
             mobile:
@@ -73,7 +73,7 @@ jobs:
 
       - name: Restore Gradle Cache
         id: cache-gradle-restore
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         with:
           path: |
             ~/.gradle/caches
@@ -130,7 +130,7 @@ jobs:
 
       - name: Save Gradle Cache
         id: cache-gradle-save
-        uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
+        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
         if: github.ref == 'refs/heads/main'
         with:
           path: |

.github/workflows/docker.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
       - name: Check what should run
         id: check
-        uses: immich-app/devtools/actions/pre-job@24820aa4ef67959b0dcf69a438cccf00d7c7042b # pre-job-action-v1.0.1
+        uses: immich-app/devtools/actions/pre-job@5f91b52dfbb92b8d96ca411ab59c896cd59714ca # pre-job-action-v1.1.0
         with:
           filters: |
             server:

.github/workflows/docs-build.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       - name: Check what should run
         id: check
-        uses: immich-app/devtools/actions/pre-job@24820aa4ef67959b0dcf69a438cccf00d7c7042b # pre-job-action-v1.0.1
+        uses: immich-app/devtools/actions/pre-job@5f91b52dfbb92b8d96ca411ab59c896cd59714ca # pre-job-action-v1.1.0
         with:
           filters: |
             docs:

.github/workflows/fix-format.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

.github/workflows/merge-translations.yml

@@ -58,7 +58,7 @@ jobs:
       - name: Generate a token
         id: generate_token
         if: ${{ inputs.skip != true }}
-        uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

.github/workflows/prepare-release.yml

@@ -49,7 +49,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -111,7 +111,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

.github/workflows/static_analysis.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
       - name: Check what should run
         id: check
-        uses: immich-app/devtools/actions/pre-job@24820aa4ef67959b0dcf69a438cccf00d7c7042b # pre-job-action-v1.0.1
+        uses: immich-app/devtools/actions/pre-job@5f91b52dfbb92b8d96ca411ab59c896cd59714ca # pre-job-action-v1.1.0
         with:
           filters: |
             mobile:

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: Check what should run
         id: check
-        uses: immich-app/devtools/actions/pre-job@24820aa4ef67959b0dcf69a438cccf00d7c7042b # pre-job-action-v1.0.1
+        uses: immich-app/devtools/actions/pre-job@5f91b52dfbb92b8d96ca411ab59c896cd59714ca # pre-job-action-v1.1.0
         with:
           filters: |
             i18n:

.github/workflows/weblate-lock.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       - name: Check what should run
         id: check
-        uses: immich-app/devtools/actions/pre-job@24820aa4ef67959b0dcf69a438cccf00d7c7042b # pre-job-action-v1.0.1
+        uses: immich-app/devtools/actions/pre-job@5f91b52dfbb92b8d96ca411ab59c896cd59714ca # pre-job-action-v1.1.0
         with:
           filters: |
             i18n:

docker/docker-compose.dev.yml

@@ -140,7 +140,7 @@ services:
 
   database:
     container_name: immich_postgres
-    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:c44be5f2871c59362966d71eab4268170eb6f5653c0e6170184e72b38ffdf107
+    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:41eacbe83eca995561fe43814fd4891e16e39632806253848efaf04d3c8a8b84
     env_file:
       - .env
     environment:

docker/docker-compose.prod.yml

@@ -63,7 +63,7 @@ services:
 
   database:
     container_name: immich_postgres
-    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:c44be5f2871c59362966d71eab4268170eb6f5653c0e6170184e72b38ffdf107
+    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:41eacbe83eca995561fe43814fd4891e16e39632806253848efaf04d3c8a8b84
     env_file:
       - .env
     environment:

docker/docker-compose.yml

@@ -56,7 +56,7 @@ services:
 
   database:
     container_name: immich_postgres
-    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:c44be5f2871c59362966d71eab4268170eb6f5653c0e6170184e72b38ffdf107
+    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:41eacbe83eca995561fe43814fd4891e16e39632806253848efaf04d3c8a8b84
     environment:
       POSTGRES_PASSWORD: ${DB_PASSWORD}
       POSTGRES_USER: ${DB_USERNAME}

i18n/en.json

@@ -28,6 +28,7 @@
   "add_to_album": "Add to album",
   "add_to_album_bottom_sheet_added": "Added to {album}",
   "add_to_album_bottom_sheet_already_exists": "Already in {album}",
+  "add_to_album_bottom_sheet_some_local_assets": "Some local assets could not be added to album",
   "add_to_album_toggle": "Toggle selection for {album}",
   "add_to_albums": "Add to albums",
   "add_to_albums_count": "Add to albums ({count})",

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

@@ -116,7 +116,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
       if (Platform.isAndroid) {
         await _backgroundHostApi.showNotification(
           IntlKeys.uploading_media.t(),
-          IntlKeys.backup_background_service_in_progress_notification.t(),
+          IntlKeys.backup_background_service_default_notification.t(),
         );
       }
 

mobile/lib/infrastructure/entities/local_asset.entity.dart

@@ -21,7 +21,7 @@ class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
 }
 
 extension LocalAssetEntityDataDomainExtension on LocalAssetEntityData {
-  LocalAsset toDto() => LocalAsset(
+  LocalAsset toDto({String? remoteId}) => LocalAsset(
     id: id,
     name: name,
     checksum: checksum,
@@ -32,7 +32,7 @@ extension LocalAssetEntityDataDomainExtension on LocalAssetEntityData {
     isFavorite: isFavorite,
     height: height,
     width: width,
-    remoteId: null,
+    remoteId: remoteId,
     orientation: orientation,
   );
 }

mobile/lib/infrastructure/entities/remote_asset.entity.dart

@@ -49,7 +49,7 @@ class RemoteAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin
 }
 
 extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
-  RemoteAsset toDto() => RemoteAsset(
+  RemoteAsset toDto({String? localId}) => RemoteAsset(
     id: id,
     name: name,
     ownerId: ownerId,
@@ -64,7 +64,7 @@ extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
     thumbHash: thumbHash,
     visibility: visibility,
     livePhotoVideoId: livePhotoVideoId,
-    localId: null,
+    localId: localId,
     stackId: stackId,
   );
 }

mobile/lib/infrastructure/repositories/timeline.repository.dart

@@ -148,10 +148,9 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
           ..orderBy([OrderingTerm.desc(_db.localAssetEntity.createdAt)])
           ..limit(count, offset: offset);
 
-    return query.map((row) {
-      final asset = row.readTable(_db.localAssetEntity).toDto();
-      return asset.copyWith(remoteId: row.read(_db.remoteAssetEntity.id));
-    }).get();
+    return query
+        .map((row) => row.readTable(_db.localAssetEntity).toDto(remoteId: row.read(_db.remoteAssetEntity.id)))
+        .get();
   }
 
   TimelineQuery remoteAlbum(String albumId, GroupAssetsBy groupBy) => (
@@ -165,17 +164,15 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
           .count(where: (row) => row.albumId.equals(albumId))
           .map(_generateBuckets)
           .watch()
-          .map((results) => results.isNotEmpty ? results.first : <Bucket>[])
-          .handleError((error) {
-            return [];
-          });
+          .map((results) => results.isNotEmpty ? results.first : const <Bucket>[])
+          .handleError((error) => const <Bucket>[]);
     }
 
     return (_db.remoteAlbumEntity.select()..where((row) => row.id.equals(albumId)))
         .watch()
         .switchMap((albums) {
           if (albums.isEmpty) {
-            return Stream.value(<Bucket>[]);
+            return Stream.value(const <Bucket>[]);
           }
 
           final album = albums.first;
@@ -207,10 +204,8 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
             return TimeBucket(date: timeline, assetCount: assetCount);
           }).watch();
         })
-        .handleError((error) {
-          // If there's an error (e.g., album was deleted), return empty buckets
-          return <Bucket>[];
-        });
+        // If there's an error (e.g., album was deleted), return empty buckets
+        .handleError((error) => const <Bucket>[]);
   }
 
   Future<List<BaseAsset>> _getRemoteAlbumBucketAssets(String albumId, {required int offset, required int count}) async {
@@ -218,17 +213,22 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
 
     // If album doesn't exist (was deleted), return empty list
     if (albumData == null) {
-      return <BaseAsset>[];
+      return const <BaseAsset>[];
     }
 
     final isAscending = albumData.order == AlbumAssetOrder.asc;
 
-    final query = _db.remoteAssetEntity.select().join([
+    final query = _db.remoteAssetEntity.select().addColumns([_db.localAssetEntity.id]).join([
       innerJoin(
         _db.remoteAlbumAssetEntity,
         _db.remoteAlbumAssetEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
         useColumns: false,
       ),
+      leftOuterJoin(
+        _db.localAssetEntity,
+        _db.remoteAssetEntity.checksum.equalsExp(_db.localAssetEntity.checksum),
+        useColumns: false,
+      ),
     ])..where(_db.remoteAssetEntity.deletedAt.isNull() & _db.remoteAlbumAssetEntity.albumId.equals(albumId));
 
     if (isAscending) {
@@ -239,12 +239,14 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
 
     query.limit(count, offset: offset);
 
-    return query.map((row) => row.readTable(_db.remoteAssetEntity).toDto()).get();
+    return query
+        .map((row) => row.readTable(_db.remoteAssetEntity).toDto(localId: row.read(_db.localAssetEntity.id)))
+        .get();
   }
 
   TimelineQuery fromAssets(List<BaseAsset> assets) => (
     bucketSource: () => Stream.value(_generateBuckets(assets.length)),
-    assetSource: (offset, count) => Future.value(assets.skip(offset).take(count).toList()),
+    assetSource: (offset, count) => Future.value(assets.skip(offset).take(count).toList(growable: false)),
   );
 
   TimelineQuery remote(String ownerId, GroupAssetsBy groupBy) => _remoteQueryBuilder(
@@ -486,6 +488,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     return query.map((row) => row.readTable(_db.remoteAssetEntity).toDto()).get();
   }
 
+  @pragma('vm:prefer-inline')
   TimelineQuery _remoteQueryBuilder({
     required Expression<bool> Function($RemoteAssetEntityTable row) filter,
     GroupAssetsBy groupBy = GroupAssetsBy.day,
@@ -523,6 +526,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     }).watch();
   }
 
+  @pragma('vm:prefer-inline')
   Future<List<BaseAsset>> _getRemoteAssets({
     required Expression<bool> Function($RemoteAssetEntityTable row) filter,
     required int offset,
@@ -543,11 +547,9 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
             ..orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)])
             ..limit(count, offset: offset);
 
-      return query.map((row) {
-        final asset = row.readTable(_db.remoteAssetEntity).toDto();
-        final localId = row.read(_db.localAssetEntity.id);
-        return asset.copyWith(localId: localId);
-      }).get();
+      return query
+          .map((row) => row.readTable(_db.remoteAssetEntity).toDto(localId: row.read(_db.localAssetEntity.id)))
+          .get();
     } else {
       final query = _db.remoteAssetEntity.select()
         ..where(filter)
@@ -560,12 +562,12 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
 }
 
 List<Bucket> _generateBuckets(int count) {
-  final buckets = List.generate(
-    (count / kTimelineNoneSegmentSize).floor(),
-    (_) => const Bucket(assetCount: kTimelineNoneSegmentSize),
+  final buckets = List.filled(
+    (count / kTimelineNoneSegmentSize).ceil(),
+    const Bucket(assetCount: kTimelineNoneSegmentSize),
   );
   if (count % kTimelineNoneSegmentSize != 0) {
-    buckets.add(Bucket(assetCount: count % kTimelineNoneSegmentSize));
+    buckets[buckets.length - 1] = Bucket(assetCount: count % kTimelineNoneSegmentSize);
   }
   return buckets;
 }
@@ -590,10 +592,6 @@ extension on String {
       GroupAssetsBy.month => "y-M",
       GroupAssetsBy.none => throw ArgumentError("GroupAssetsBy.none is not supported for date formatting"),
     };
-    try {
-      return DateFormat(format, 'en').parse(this);
-    } catch (e) {
-      throw FormatException("Invalid date format: $this", e);
-    }
+    return DateFormat(format, 'en').parse(this);
   }
 }

mobile/lib/presentation/pages/drift_map.page.dart

@@ -25,9 +25,10 @@ class DriftMapPage extends StatelessWidget {
               onPressed: () => context.pop(),
               icon: const Icon(Icons.arrow_back_ios_new_rounded),
               style: IconButton.styleFrom(
-                shape: const CircleBorder(side: BorderSide(width: 1, color: Colors.black26)),
                 padding: const EdgeInsets.all(8),
-                backgroundColor: Colors.indigo.withValues(alpha: 0.7),
+                backgroundColor: Colors.indigo,
+                shadowColor: Colors.black26,
+                elevation: 4,
               ),
             ),
           ),

mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart

@@ -5,6 +5,7 @@ import 'package:immich_mobile/constants/enums.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/setting.model.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/advanced_info_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
@@ -62,11 +63,19 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
         return;
       }
 
+      final remoteAssets = selectedAssets.whereType<RemoteAsset>();
       final addedCount = await ref
           .read(remoteAlbumProvider.notifier)
-          .addAssets(album.id, selectedAssets.map((e) => (e as RemoteAsset).id).toList());
+          .addAssets(album.id, remoteAssets.map((e) => e.id).toList());
 
-      if (addedCount != selectedAssets.length) {
+      if (selectedAssets.length != remoteAssets.length) {
+        ImmichToast.show(
+          context: context,
+          msg: 'add_to_album_bottom_sheet_some_local_assets'.t(context: context),
+        );
+      }
+
+      if (addedCount != remoteAssets.length) {
         ImmichToast.show(
           context: context,
           msg: 'add_to_album_bottom_sheet_already_exists'.tr(namedArgs: {"album": album.name}),
@@ -113,10 +122,12 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
         if (multiselect.hasLocal || multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
         if (multiselect.hasLocal) const UploadActionButton(source: ActionSource.timeline),
       ],
-      slivers: [
-        const AddToAlbumHeader(),
-        AlbumSelector(onAlbumSelected: addAssetsToAlbum, onKeyboardExpanded: onKeyboardExpand),
-      ],
+      slivers: multiselect.hasRemote
+          ? [
+              const AddToAlbumHeader(),
+              AlbumSelector(onAlbumSelected: addAssetsToAlbum, onKeyboardExpanded: onKeyboardExpand),
+            ]
+          : [],
     );
   }
 }

mobile/lib/presentation/widgets/bottom_sheet/map_bottom_sheet.widget.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/map/map.state.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
@@ -10,13 +11,14 @@ class MapBottomSheet extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return const BaseBottomSheet(
+    return BaseBottomSheet(
       initialChildSize: 0.25,
       maxChildSize: 0.9,
       shouldCloseOnMinExtent: false,
       resizeOnScroll: false,
       actions: [],
-      slivers: [SliverFillRemaining(hasScrollBody: false, child: _ScopedMapTimeline())],
+      backgroundColor: context.themeData.colorScheme.surface,
+      slivers: [const SliverFillRemaining(hasScrollBody: false, child: _ScopedMapTimeline())],
     );
   }
 }

mobile/lib/presentation/widgets/map/map.widget.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:io';
+import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
@@ -9,8 +10,8 @@ import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/map_bottom_sheet.widget.dart';
-import 'package:immich_mobile/presentation/widgets/map/map_utils.dart';
 import 'package:immich_mobile/presentation/widgets/map/map.state.dart';
+import 'package:immich_mobile/presentation/widgets/map/map_utils.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';
 import 'package:immich_mobile/utils/debounce.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -187,6 +188,8 @@ class _Map extends StatelessWidget {
           styleString: style,
           onMapCreated: onMapCreated,
           onStyleLoadedCallback: onMapReady,
+          attributionButtonPosition: AttributionButtonPosition.topRight,
+          attributionButtonMargins: Platform.isIOS ? const Point(40, 12) : const Point(40, 72),
         ),
       ),
     );

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

@@ -212,11 +212,14 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
       if (fallbackSegment != null) {
         // Scroll to the segment with a small offset to show the header
         final targetOffset = fallbackSegment.startOffset - 50;
-        _scrollController.animateTo(
-          targetOffset.clamp(0.0, _scrollController.position.maxScrollExtent),
-          duration: const Duration(milliseconds: 500),
-          curve: Curves.easeInOut,
-        );
+        ref.read(timelineStateProvider.notifier).setScrubbing(true);
+        _scrollController
+            .animateTo(
+              targetOffset.clamp(0.0, _scrollController.position.maxScrollExtent),
+              duration: const Duration(milliseconds: 500),
+              curve: Curves.easeInOut,
+            )
+            .whenComplete(() => ref.read(timelineStateProvider.notifier).setScrubbing(false));
       }
     });
   }

mobile/lib/providers/backup/drift_backup.provider.dart

@@ -1,6 +1,5 @@
 // ignore_for_file: public_member_api_docs, sort_constructors_first
 import 'dart:async';
-import 'dart:convert';
 
 import 'package:background_downloader/background_downloader.dart';
 import 'package:collection/collection.dart';
@@ -12,8 +11,8 @@ import 'package:immich_mobile/infrastructure/repositories/backup.repository.dart
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/upload.service.dart';
-import 'package:logging/logging.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
+import 'package:logging/logging.dart';
 
 class EnqueueStatus {
   final int enqueueCount;
@@ -90,33 +89,6 @@ class DriftUploadStatus {
         networkSpeedAsString.hashCode ^
         isFailed.hashCode;
   }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'taskId': taskId,
-      'filename': filename,
-      'progress': progress,
-      'fileSize': fileSize,
-      'networkSpeedAsString': networkSpeedAsString,
-      'isFailed': isFailed,
-    };
-  }
-
-  factory DriftUploadStatus.fromMap(Map<String, dynamic> map) {
-    return DriftUploadStatus(
-      taskId: map['taskId'] as String,
-      filename: map['filename'] as String,
-      progress: map['progress'] as double,
-      fileSize: map['fileSize'] as int,
-      networkSpeedAsString: map['networkSpeedAsString'] as String,
-      isFailed: map['isFailed'] != null ? map['isFailed'] as bool : null,
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory DriftUploadStatus.fromJson(String source) =>
-      DriftUploadStatus.fromMap(json.decode(source) as Map<String, dynamic>);
 }
 
 class DriftBackupState {
@@ -267,6 +239,7 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
         }
 
         state = state.copyWith(uploadItems: {...state.uploadItems, taskId: currentItem.copyWith(isFailed: true)});
+        _logger.fine("Upload failed for taskId: $taskId, exception: ${update.exception}");
         break;
 
       case TaskStatus.canceled:

mobile/lib/services/upload.service.dart

@@ -9,6 +9,7 @@ import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/backup.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
@@ -19,9 +20,9 @@ import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
+import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
-import 'package:immich_mobile/utils/debug_print.dart';
 
 final uploadServiceProvider = Provider((ref) {
   final service = UploadService(
@@ -205,10 +206,20 @@ class UploadService {
     return _uploadRepository.start();
   }
 
-  void _handleTaskStatusUpdate(TaskStatusUpdate update) {
+  void _handleTaskStatusUpdate(TaskStatusUpdate update) async {
     switch (update.status) {
       case TaskStatus.complete:
         _handleLivePhoto(update);
+
+        if (CurrentPlatform.isIOS) {
+          try {
+            final path = await update.task.filePath();
+            await File(path).delete();
+          } catch (e) {
+            _logger.severe('Error deleting file path for iOS: $e');
+          }
+        }
+
         break;
 
       default:

mobile/lib/widgets/common/immich_app_bar.dart

@@ -129,19 +129,24 @@ class ImmichAppBar extends ConsumerWidget implements PreferredSizeWidget {
       title: Builder(
         builder: (BuildContext context) {
           return Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
             children: [
-              Builder(
-                builder: (context) {
-                  return Padding(
-                    padding: const EdgeInsets.only(top: 3.0),
-                    child: SvgPicture.asset(
-                      context.isDarkTheme
-                          ? 'assets/immich-logo-inline-dark.svg'
-                          : 'assets/immich-logo-inline-light.svg',
-                      height: 40,
-                    ),
-                  );
-                },
+              Padding(
+                padding: const EdgeInsets.only(top: 3.0),
+                child: SvgPicture.asset(
+                  context.isDarkTheme ? 'assets/immich-logo-inline-dark.svg' : 'assets/immich-logo-inline-light.svg',
+                  height: 40,
+                ),
+              ),
+              const Tooltip(
+                triggerMode: TooltipTriggerMode.tap,
+                showDuration: Duration(seconds: 4),
+                message:
+                    "The old timeline is deprecated and will be removed in a future release. Kindly switch to the new timeline under Advanced Settings.",
+                child: Padding(
+                  padding: EdgeInsets.only(top: 3.0),
+                  child: Icon(Icons.error_rounded, fill: 1, color: Colors.amber, size: 20),
+                ),
               ),
             ],
           );

server/Dockerfile

@@ -1,21 +1,4 @@
 FROM ghcr.io/immich-app/base-server-dev:202509210934@sha256:b5ce2d7eaf379d4cf15efd4bab180d8afc8a80d20b36c9800f4091aca6ae267e AS builder
-
-ARG TUSD_RELEASE=v2.8.0
-ARG TUSD_AMD64_SHA256=33aaa15e14c7b025772d28605c6e0733ec2e8c1d6b646fa6b83af0049022a9ce
-ARG TUSD_ARM64_SHA256=07f78ee2fd552296c40f3a7a5a06325a06b53f1dd1ba996a60ecc52696906481
-
-# TODO: move this to base image
-RUN apt-get update && apt-get install -y curl && \
-  if [ $(arch) = "x86_64" ]; then \
-  curl -fsSL -o /tmp/tusd.deb "https://github.com/tus/tusd/releases/download/${TUSD_RELEASE}/tusd_snapshot_amd64.deb" && \
-  echo "${TUSD_AMD64_SHA256}  /tmp/tusd.deb" | sha256sum -c; \
-  else \
-  curl -fsSL -o /tmp/tusd.deb "https://github.com/tus/tusd/releases/download/${TUSD_RELEASE}/tusd_snapshot_arm64.deb" && \
-  echo "${TUSD_ARM64_SHA256}  /tmp/tusd.deb" | sha256sum -c; \
-  fi && \
-  dpkg -i /tmp/tusd.deb && \
-  rm -f /tmp/tusd.deb
-
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
   CI=1 \
   COREPACK_HOME=/tmp
@@ -57,7 +40,6 @@ ENV NODE_ENV=production \
   NVIDIA_DRIVER_CAPABILITIES=all \
   NVIDIA_VISIBLE_DEVICES=all
 
-COPY --from=builder /usr/bin/tusd /usr/bin/tusd
 COPY --from=server /output/server-pruned ./server
 COPY --from=web /usr/src/app/web/build /build/www
 COPY --from=cli /output/cli-pruned ./cli

server/Dockerfile.dev

@@ -1,21 +1,6 @@
 # dev build
 FROM ghcr.io/immich-app/base-server-dev:202509210934@sha256:b5ce2d7eaf379d4cf15efd4bab180d8afc8a80d20b36c9800f4091aca6ae267e AS dev
 
-ARG TUSD_RELEASE=v2.8.0
-ARG TUSD_AMD64_SHA256=33aaa15e14c7b025772d28605c6e0733ec2e8c1d6b646fa6b83af0049022a9ce
-ARG TUSD_ARM64_SHA256=07f78ee2fd552296c40f3a7a5a06325a06b53f1dd1ba996a60ecc52696906481
-
-# TODO: move this to base image
-RUN if [ $(arch) = "x86_64" ]; then \
-  curl -fsSL -o /tmp/tusd.deb "https://github.com/tus/tusd/releases/download/${TUSD_RELEASE}/tusd_snapshot_amd64.deb" && \
-  echo "${TUSD_AMD64_SHA256}  /tmp/tusd.deb" | sha256sum -c; \
-  else \
-  curl -fsSL -o /tmp/tusd.deb "https://github.com/tus/tusd/releases/download/${TUSD_RELEASE}/tusd_snapshot_arm64.deb" && \
-  echo "${TUSD_ARM64_SHA256}  /tmp/tusd.deb" | sha256sum -c; \
-  fi && \
-  dpkg -i /tmp/tusd.deb && \
-  rm -f /tmp/tusd.deb
-
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
   CI=1 \
   COREPACK_HOME=/tmp

server/src/app.module.ts

@@ -28,6 +28,7 @@ import { getKyselyConfig } from 'src/utils/database';
 const common = [...repositories, ...services, GlobalExceptionFilter];
 
 export const middleware = [
+  FileUploadInterceptor,
   { provide: APP_FILTER, useClass: GlobalExceptionFilter },
   { provide: APP_PIPE, useValue: new ValidationPipe({ transform: true, whitelist: true }) },
   { provide: APP_INTERCEPTOR, useClass: LoggingInterceptor },
@@ -84,7 +85,7 @@ class BaseModule implements OnModuleInit, OnModuleDestroy {
 @Module({
   imports: [...imports, ScheduleModule.forRoot()],
   controllers: [...controllers],
-  providers: [...common, ...middleware, FileUploadInterceptor, { provide: IWorker, useValue: ImmichWorker.Api }],
+  providers: [...common, ...middleware, { provide: IWorker, useValue: ImmichWorker.Api }],
 })
 export class ApiModule extends BaseModule {}
 

server/src/constants.ts

@@ -16,11 +16,6 @@ export const ADDED_IN_PREFIX = 'This property was added in ';
 
 export const JOBS_ASSET_PAGINATION_SIZE = 1000;
 export const JOBS_LIBRARY_PAGINATION_SIZE = 10_000;
-export const UPLOAD_TUSD_SOCKET_PATH = '/tmp/immich-tusd.sock';
-export const UPLOAD_CHUNK_DIRECTORY = '/tmp/immich-chunked-uploads';
-export const UPLOAD_TUSD_CONNECT_TIMEOUT_MS = 1000;
-export const UPLOAD_TUSD_CONNECT_BACKOFF_MS = 100;
-export const UPLOAD_TUSD_CONNECT_RETRIES = 30;
 
 export const EXTENSION_NAMES: Record<DatabaseExtension, string> = {
   cube: 'cube',

server/src/controllers/asset-upload.controller.ts

@@ -1,82 +0,0 @@
-import { All, BadRequestException, Body, Controller, HttpException, Post, Req, Res } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
-import { plainToInstance } from 'class-transformer';
-import { validateSync } from 'class-validator';
-import { Request, Response } from 'express';
-import {
-  TusdHookRequestDto,
-  TusdHookRequestType,
-  TusdHookResponseDto,
-  TusdPreCreateEventDto,
-  TusdPreFinishEventDto,
-} from 'src/dtos/upload.dto';
-import { Permission } from 'src/enum';
-import { LoggingRepository } from 'src/repositories/logging.repository';
-import { AssetUploadService } from 'src/services/asset-upload.service';
-import { AuthService } from 'src/services/auth.service';
-
-@ApiTags('Upload')
-@Controller('upload')
-export class AssetUploadController {
-  constructor(
-    private authService: AuthService,
-    private uploadService: AssetUploadService,
-    private logger: LoggingRepository,
-  ) {
-    logger.setContext(AssetUploadController.name);
-  }
-
-  // Proxies chunked upload requests to the tusd server.
-  // Auth is handled in the pre-create and pre-finish hooks from tusd.
-  @All('asset{/*all}')
-  handleChunks(@Req() request: Request, @Res() response: Response): Promise<unknown> {
-    return this.uploadService.proxyChunks(request, response);
-  }
-
-  // This controller handles webhooks from the tusd server.
-  // See https://tus.github.io/tusd/advanced-topics/hooks/ for more information.
-  @Post('hook')
-  async processHook(@Body() payload: TusdHookRequestDto): Promise<TusdHookResponseDto> {
-    const request = payload.Event.HTTPRequest;
-    const lowerCaseHeaders: Record<string, string> = {};
-    for (const [key, [value]] of Object.entries(request.Header)) {
-      lowerCaseHeaders[key.toLowerCase()] = value;
-    }
-
-    try {
-      const auth = await this.authService.authenticate({
-        headers: lowerCaseHeaders,
-        queryParams: {},
-        metadata: { adminRoute: false, sharedLinkRoute: false, permission: Permission.AssetUpload, uri: request.URI },
-      });
-
-      switch (payload.Type) {
-        case TusdHookRequestType.PreCreate: {
-          const dto = plainToInstance(TusdPreCreateEventDto, payload.Event);
-          const errors = validateSync(dto, { whitelist: true });
-          if (errors.length > 0) {
-            throw new BadRequestException('Invalid payload');
-          }
-          return await this.uploadService.handlePreCreate(auth, dto, lowerCaseHeaders);
-        }
-        case TusdHookRequestType.PreFinish: {
-          const dto = plainToInstance(TusdPreFinishEventDto, payload.Event);
-          const errors = validateSync(dto, { whitelist: true });
-          if (errors.length > 0) {
-            throw new BadRequestException('Invalid payload');
-          }
-          return await this.uploadService.handlePreFinish(auth, dto);
-        }
-        default: {
-          throw new Error(`Unhandled hook type: ${payload.Type}`);
-        }
-      }
-    } catch (error: any) {
-      if (error instanceof HttpException) {
-        return { RejectUpload: true, HTTPResponse: { StatusCode: error.getStatus(), Body: error.message } };
-      }
-      this.logger.error('Error processing upload hook', error);
-      return { RejectUpload: true, HTTPResponse: { StatusCode: 500 } };
-    }
-  }
-}

server/src/controllers/index.ts

@@ -3,7 +3,6 @@ import { AlbumController } from 'src/controllers/album.controller';
 import { ApiKeyController } from 'src/controllers/api-key.controller';
 import { AppController } from 'src/controllers/app.controller';
 import { AssetMediaController } from 'src/controllers/asset-media.controller';
-import { AssetUploadController } from 'src/controllers/asset-upload.controller';
 import { AssetController } from 'src/controllers/asset.controller';
 import { AuthAdminController } from 'src/controllers/auth-admin.controller';
 import { AuthController } from 'src/controllers/auth.controller';
@@ -41,7 +40,6 @@ export const controllers = [
   AppController,
   AssetController,
   AssetMediaController,
-  AssetUploadController,
   AuthController,
   AuthAdminController,
   DownloadController,

server/src/dtos/upload.dto.ts

@@ -1,133 +0,0 @@
-import { Type } from 'class-transformer';
-import { IsEnum, IsInt, IsNotEmpty, IsObject, IsString, IsUUID, ValidateNested } from 'class-validator';
-import { AssetMediaCreateDto } from 'src/dtos/asset-media.dto';
-
-export enum TusdHookRequestType {
-  PreCreate = 'pre-create',
-  PreFinish = 'pre-finish',
-}
-
-export enum TusdHookStorageType {
-  FileStore = 'filestore',
-}
-
-export class TusdStorageDto {
-  @IsEnum(TusdHookStorageType)
-  Type!: string;
-
-  @IsString()
-  @IsNotEmpty()
-  Path!: string;
-
-  @IsString()
-  @IsNotEmpty()
-  InfoPath!: string;
-}
-
-export class UploadAssetDataDto extends AssetMediaCreateDto {
-  @IsString()
-  @IsNotEmpty()
-  declare filename: string;
-}
-
-export class TusdMetaDataDto {
-  @IsString()
-  @IsNotEmpty()
-  declare AssetData: string; // base64-encoded JSON string of UploadAssetDataDto
-}
-
-export class TusdPreCreateUploadDto {
-  @IsInt()
-  Size!: number;
-}
-
-export class TusdPreFinishUploadDto {
-  @IsUUID()
-  ID!: string;
-
-  @IsInt()
-  Size!: number;
-
-  @Type(() => TusdMetaDataDto)
-  @ValidateNested()
-  @IsObject()
-  MetaData!: TusdMetaDataDto;
-
-  @Type(() => TusdStorageDto)
-  @ValidateNested()
-  @IsObject()
-  Storage!: TusdStorageDto;
-}
-
-export class TusdHttpRequestDto {
-  @IsString()
-  @IsNotEmpty()
-  Method!: string;
-
-  @IsString()
-  @IsNotEmpty()
-  URI!: string;
-
-  @IsObject()
-  Header!: Record<string, string[]>;
-}
-
-export class TusdPreCreateEventDto {
-  @Type(() => TusdPreCreateUploadDto)
-  @ValidateNested()
-  @IsObject()
-  Upload!: TusdPreCreateUploadDto;
-
-  @Type(() => TusdHttpRequestDto)
-  @ValidateNested()
-  @IsObject()
-  HTTPRequest!: TusdHttpRequestDto;
-}
-
-export class TusdPreFinishEventDto {
-  @Type(() => TusdPreFinishUploadDto)
-  @ValidateNested()
-  @IsObject()
-  Upload!: TusdPreFinishUploadDto;
-
-  @Type(() => TusdHttpRequestDto)
-  @ValidateNested()
-  @IsObject()
-  HTTPRequest!: TusdHttpRequestDto;
-}
-
-export class TusdHookRequestDto {
-  @IsEnum(TusdHookRequestType)
-  Type!: TusdHookRequestType;
-
-  @IsObject()
-  Event!: TusdPreCreateEventDto | TusdPreFinishEventDto;
-}
-
-export class TusdHttpResponseDto {
-  StatusCode!: number;
-
-  Body?: string;
-
-  Header?: Record<string, string>;
-}
-
-export class TusdChangeFileInfoStorageDto {
-  Path?: string;
-}
-
-export class TusdChangeFileInfoDto {
-  ID?: string;
-
-  MetaData?: TusdMetaDataDto;
-
-  Storage?: TusdChangeFileInfoStorageDto;
-}
-
-export class TusdHookResponseDto {
-  HTTPResponse?: TusdHttpResponseDto;
-
-  RejectUpload?: boolean;
-
-  ChangeFileInfo?: TusdChangeFileInfoDto;
-}

server/src/enum.ts

@@ -20,7 +20,6 @@ export enum ImmichHeader {
   SharedLinkSlug = 'x-immich-share-slug',
   Checksum = 'x-immich-checksum',
   Cid = 'x-immich-cid',
-  AssetData = 'x-immich-asset-data',
 }
 
 export enum ImmichQuery {
@@ -494,7 +493,6 @@ export enum BootstrapEventPriority {
   JobService = -190,
   // Initialise config after other bootstrap services, stop other services from using config on bootstrap
   SystemConfig = 100,
-  UploadService = 200,
 }
 
 export enum QueueName {

server/src/repositories/storage.repository.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import archiver from 'archiver';
 import chokidar, { ChokidarOptions } from 'chokidar';
 import { escapePath, glob, globStream } from 'fast-glob';
-import { constants, createReadStream, createWriteStream, existsSync, mkdirSync, unlinkSync } from 'node:fs';
+import { constants, createReadStream, createWriteStream, existsSync, mkdirSync } from 'node:fs';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import { Readable, Writable } from 'node:stream';
@@ -134,16 +134,6 @@ export class StorageRepository {
     }
   }
 
-  unlinkSync(file: string) {
-    try {
-      unlinkSync(file);
-    } catch (error) {
-      if ((error as NodeJS.ErrnoException)?.code !== 'ENOENT') {
-        throw error;
-      }
-    }
-  }
-
   async unlinkDir(folder: string, options: { recursive?: boolean; force?: boolean }) {
     await fs.rm(folder, options);
   }
@@ -166,13 +156,10 @@ export class StorageRepository {
     }
   }
 
-  mkdir(filepath: string): Promise<String | undefined> {
-    return fs.mkdir(filepath, { recursive: true });
-  }
-
   mkdirSync(filepath: string): void {
-    // does not throw an error if the folder already exists
-    mkdirSync(filepath, { recursive: true });
+    if (!existsSync(filepath)) {
+      mkdirSync(filepath, { recursive: true });
+    }
   }
 
   existsSync(filepath: string) {

server/src/services/asset-upload.service.ts

@@ -1,318 +0,0 @@
-import { BadRequestException, Injectable, InternalServerErrorException } from '@nestjs/common';
-import { plainToInstance } from 'class-transformer';
-import { validateSync } from 'class-validator';
-import { Request, Response } from 'express';
-import { ChildProcess, spawn } from 'node:child_process';
-import { request as httpRequest } from 'node:http';
-import { createConnection } from 'node:net';
-import { extname, join, parse, resolve } from 'node:path';
-import {
-  UPLOAD_CHUNK_DIRECTORY,
-  UPLOAD_TUSD_CONNECT_BACKOFF_MS,
-  UPLOAD_TUSD_CONNECT_RETRIES,
-  UPLOAD_TUSD_CONNECT_TIMEOUT_MS,
-  UPLOAD_TUSD_SOCKET_PATH,
-} from 'src/constants';
-import { StorageCore } from 'src/cores/storage.core';
-import { OnEvent } from 'src/decorators';
-import { AssetMediaStatus } from 'src/dtos/asset-media-response.dto';
-import { AuthDto } from 'src/dtos/auth.dto';
-import {
-  TusdHookResponseDto,
-  TusdPreCreateEventDto,
-  TusdPreFinishEventDto,
-  UploadAssetDataDto,
-} from 'src/dtos/upload.dto';
-import { AssetVisibility, ImmichHeader, ImmichWorker, JobName, StorageFolder } from 'src/enum';
-import { BaseService } from 'src/services/base.service';
-import { isAssetChecksumConstraint } from 'src/utils/database';
-import { mimeTypes } from 'src/utils/mime-types';
-import { fromChecksum } from 'src/utils/request';
-
-@Injectable()
-export class AssetUploadService extends BaseService {
-  private tusdProcess?: ChildProcess;
-
-  @OnEvent({ name: 'AppBootstrap', workers: [ImmichWorker.Api] })
-  async onBootstrap() {
-    await this.storageRepository.unlinkDir(UPLOAD_CHUNK_DIRECTORY, { recursive: true, force: true });
-    await this.storageRepository.mkdir(UPLOAD_CHUNK_DIRECTORY);
-    const { host, port } = this.configRepository.getEnv();
-
-    const args = [
-      '-unix-sock',
-      UPLOAD_TUSD_SOCKET_PATH,
-      '--base-path',
-      '/api/upload/asset',
-      '--upload-dir',
-      UPLOAD_CHUNK_DIRECTORY,
-      '--hooks-http',
-      `http://${host ?? 'localhost'}:${port}:/api/upload/hook`,
-      '--hooks-enabled-events',
-      'pre-create,pre-finish',
-      '--behind-proxy',
-      '-enable-experimental-protocol',
-      '-shutdown-timeout',
-      '5s',
-      '-hooks-http-forward-headers',
-      Object.values(ImmichHeader).join(',') + ',authorization',
-      '-disable-download',
-      '-disable-termination',
-    ];
-
-    this.logger.log(`Starting tusd server with args: ${args.join(' ')}`);
-
-    this.tusdProcess = spawn('tusd', args, {
-      stdio: ['ignore', 'pipe', 'pipe'],
-    });
-
-    this.tusdProcess.stdout?.on('data', (data) => this.logger.verboseFn(() => `tusd: ${data.toString().trim()}`));
-
-    this.tusdProcess.stderr?.on('data', (data) => this.logger.warn(`tusd: ${data.toString().trim()}`));
-
-    this.tusdProcess.on('error', (error) => {
-      this.logger.error(`tusd failed to start: ${error.message}`);
-      process.exit(1);
-    });
-
-    this.tusdProcess.on('exit', async (code) => {
-      this.tusdProcess = undefined;
-      try {
-        await Promise.all([
-          this.storageRepository.unlink(UPLOAD_TUSD_SOCKET_PATH),
-          this.storageRepository.unlinkDir(UPLOAD_CHUNK_DIRECTORY, { recursive: true, force: true }),
-        ]);
-      } finally {
-        if (code) {
-          this.logger.error(`tusd exited unexpectedly with code ${code}`);
-          // TODO: more graceful shutdown
-          process.exit(code);
-        }
-      }
-    });
-
-    this.logger.log('Waiting for tusd server...');
-    await this.waitForTusd(UPLOAD_TUSD_SOCKET_PATH);
-    this.logger.log('tusd server started successfully');
-  }
-
-  @OnEvent({ name: 'AppShutdown' })
-  onShutdown() {
-    this.tusdProcess?.kill('SIGTERM');
-    this.tusdProcess = undefined;
-  }
-
-  async proxyChunks(request: Request, response: Response): Promise<unknown> {
-    if (!this.tusdProcess) {
-      throw new InternalServerErrorException('tusd server is not running');
-    }
-
-    delete request.headers.host;
-    request.headers.connection = 'close'; // not sure why, but it doesn't respond for 60 seconds without this
-    return new Promise((resolve, reject) => {
-      const proxyReq = httpRequest(
-        {
-          socketPath: UPLOAD_TUSD_SOCKET_PATH,
-          path: request.url,
-          method: request.method,
-          headers: request.headers,
-        },
-        (proxyRes) => {
-          response.status(proxyRes.statusCode || 200);
-          for (const [key, value] of Object.entries(proxyRes.headers)) {
-            if (value !== undefined) {
-              response.setHeader(key, value);
-            }
-          }
-
-          proxyRes.pipe(response);
-          proxyRes.on('end', resolve);
-          proxyRes.on('error', reject);
-        },
-      );
-
-      proxyReq.on('error', (error: any) => {
-        this.logger.error(`Failed to proxy to tusd: ${error.message}`);
-        reject(new InternalServerErrorException('Upload service unavailable'));
-      });
-
-      if (request.readable) {
-        request.pipe(proxyReq);
-      } else {
-        proxyReq.end();
-      }
-    });
-  }
-
-  private async waitForTusd(socketPath: string, maxRetries = UPLOAD_TUSD_CONNECT_RETRIES): Promise<void> {
-    for (let i = 0; i < maxRetries; i++) {
-      const ready = await new Promise<boolean>((resolve) => {
-        const socket = createConnection(socketPath, () => {
-          socket.end();
-          resolve(true);
-        });
-
-        socket.on('error', () => {
-          resolve(false);
-        });
-
-        socket.setTimeout(UPLOAD_TUSD_CONNECT_TIMEOUT_MS);
-        socket.on('timeout', () => {
-          socket.destroy();
-          resolve(false);
-        });
-      });
-
-      if (ready) {
-        return;
-      }
-
-      await new Promise((r) => setTimeout(r, UPLOAD_TUSD_CONNECT_BACKOFF_MS));
-    }
-
-    throw new Error('tusd server failed to start within timeout');
-  }
-
-  async handlePreCreate(
-    auth: AuthDto,
-    payload: TusdPreCreateEventDto,
-    headers: Record<string, string>,
-  ): Promise<TusdHookResponseDto> {
-    this.logger.debugFn(() => `PreCreate hook received: ${JSON.stringify(payload)}`);
-    const checksum = headers[ImmichHeader.Checksum]?.[0];
-    if (checksum) {
-      const existingId = await this.assetRepository.getUploadAssetIdByChecksum(auth.user.id, fromChecksum(checksum));
-      if (existingId) {
-        const body = JSON.stringify({ status: AssetMediaStatus.DUPLICATE, id: existingId });
-        return {
-          RejectUpload: true,
-          HTTPResponse: { StatusCode: 200, Body: body },
-        };
-      }
-    }
-
-    this.requireQuota(auth, payload.Upload.Size);
-    const encodedAssetData = headers[ImmichHeader.AssetData];
-    if (!encodedAssetData) {
-      throw new BadRequestException(`Missing ${ImmichHeader.AssetData} header`);
-    }
-
-    const assetData = this.parseMetadata(encodedAssetData);
-    this.logger.log('assetData: ' + JSON.stringify(assetData));
-
-    const assetId = this.cryptoRepository.randomUUID();
-    const folder = StorageCore.getNestedFolder(StorageFolder.Upload, auth.user.id, assetId);
-    const extension = extname(assetId);
-    const path = join(folder, `${assetId}${extension}`);
-    return {
-      ChangeFileInfo: {
-        ID: assetId,
-        Storage: { Path: path },
-        MetaData: {
-          AssetData: encodedAssetData,
-        },
-      },
-    };
-  }
-
-  async handlePreFinish(auth: AuthDto, dto: TusdPreFinishEventDto): Promise<TusdHookResponseDto> {
-    this.logger.debugFn(() => `PreFinish hook received: ${JSON.stringify(dto)}`);
-    const {
-      Upload: {
-        MetaData: { AssetData: encodedAssetData },
-        Storage: { Path: path },
-        Size: size,
-        ID: assetId,
-      },
-    } = dto;
-
-    const parsedPath = parse(resolve(path));
-    if (!parsedPath.dir.startsWith(StorageCore.getFolderLocation(StorageFolder.Upload, auth.user.id))) {
-      throw new BadRequestException('Path is not in user folder');
-    }
-    const metadata = this.parseMetadata(encodedAssetData);
-
-    try {
-      this.requireQuota(auth, size);
-      const checksum = await this.cryptoRepository.hashFile(path);
-      await this.storageRepository.utimes(path, new Date(), new Date(metadata.fileModifiedAt));
-      try {
-        await this.assetRepository.create({
-          id: assetId,
-          ownerId: auth.user.id,
-          libraryId: null,
-          checksum,
-          originalPath: path,
-          deviceAssetId: metadata.deviceAssetId,
-          deviceId: metadata.deviceId,
-          fileCreatedAt: metadata.fileCreatedAt,
-          fileModifiedAt: metadata.fileModifiedAt,
-          localDateTime: metadata.fileCreatedAt,
-          type: mimeTypes.assetType(path),
-          isFavorite: metadata.isFavorite,
-          duration: metadata.duration || null,
-          visibility: metadata.visibility || AssetVisibility.Timeline,
-          originalFileName: metadata.filename || parsedPath.base,
-        });
-      } catch (error: any) {
-        if (isAssetChecksumConstraint(error)) {
-          const duplicateId = await this.assetRepository.getUploadAssetIdByChecksum(auth.user.id, checksum);
-          if (!duplicateId) {
-            this.logger.error(`Error locating duplicate for checksum constraint`);
-            throw new InternalServerErrorException();
-          }
-          void this.tryUnlink(path);
-          const body = JSON.stringify({ id: duplicateId, status: AssetMediaStatus.DUPLICATE });
-          return { HTTPResponse: { StatusCode: 200, Body: body } };
-        }
-      }
-    } catch (error: any) {
-      void this.tryUnlink(path);
-      throw error;
-    }
-
-    await this.userRepository.updateUsage(auth.user.id, size);
-    await this.assetRepository.upsertExif({ assetId: assetId, fileSizeInByte: size });
-    await this.jobRepository.queue({
-      name: JobName.AssetExtractMetadata,
-      data: { id: assetId, source: 'upload' },
-    });
-
-    this.logger.log(`Asset created from chunked upload: ${assetId}`);
-    const body = JSON.stringify({ id: assetId, status: AssetMediaStatus.CREATED });
-    return { HTTPResponse: { StatusCode: 201, Body: body } };
-  }
-
-  private async tryUnlink(path: string): Promise<void> {
-    try {
-      await this.storageRepository.unlink(path);
-    } catch {
-      this.logger.warn(`Failed to remove file at ${path}`);
-    }
-  }
-
-  private requireQuota(auth: AuthDto, size: number) {
-    if (auth.user.quotaSizeInBytes === null) {
-      return;
-    }
-
-    if (auth.user.quotaSizeInBytes < auth.user.quotaUsageInBytes + size) {
-      throw new BadRequestException('Quota has been exceeded!');
-    }
-  }
-
-  private parseMetadata(encodedAssetData: string): UploadAssetDataDto {
-    let assetData: any;
-    try {
-      assetData = JSON.parse(Buffer.from(encodedAssetData, 'base64').toString('utf8'));
-    } catch {
-      throw new BadRequestException(`Invalid ${ImmichHeader.AssetData} header`);
-    }
-    const dto = plainToInstance(UploadAssetDataDto, assetData);
-    const assetDataErrors = validateSync(dto, { whitelist: true });
-    if (assetDataErrors.length > 0 || !mimeTypes.isAsset(assetData.filename)) {
-      throw new BadRequestException(`Invalid ${ImmichHeader.AssetData} header`);
-    }
-    return dto;
-  }
-}

server/src/services/index.ts

@@ -3,7 +3,6 @@ import { AlbumService } from 'src/services/album.service';
 import { ApiKeyService } from 'src/services/api-key.service';
 import { ApiService } from 'src/services/api.service';
 import { AssetMediaService } from 'src/services/asset-media.service';
-import { AssetUploadService } from 'src/services/asset-upload.service';
 import { AssetService } from 'src/services/asset.service';
 import { AuditService } from 'src/services/audit.service';
 import { AuthAdminService } from 'src/services/auth-admin.service';
@@ -48,7 +47,6 @@ export const services = [
   AlbumService,
   ApiService,
   AssetMediaService,
-  AssetUploadService,
   AssetService,
   AuditService,
   AuthService,

web/src/lib/components/layouts/user-page-layout.svelte

@@ -49,7 +49,7 @@
 <div
   tabindex="-1"
   class="relative z-0 grid grid-cols-[--spacing(0)_auto] overflow-hidden sidebar:grid-cols-[--spacing(64)_auto]
-    {hideNavbar ? 'h-dvh' : 'h-[calc(100dvh-var(--navbar-height))]'}
+    {hideNavbar ? 'h-dvh' : 'h-[calc(100dvh-var(--navbar-height))] max-md:h-[calc(100dvh-var(--navbar-height-md))]'}
     {hideNavbar ? 'pt-(--navbar-height)' : ''}
     {hideNavbar ? 'max-md:pt-(--navbar-height-md)' : ''}"
 >