remove dynamic layout setting for new timeline

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

@@ -6,8 +6,6 @@ import 'package:immich_mobile/infrastructure/repositories/local_asset.repository
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
 
-typedef _AssetVideoDimension = ({double? width, double? height, bool isFlipped});
-
 class AssetService {
   final RemoteAssetRepository _remoteAssetRepository;
   final DriftLocalAssetRepository _localAssetRepository;
@@ -60,48 +58,44 @@ class AssetService {
   }
 
   Future<double> getAspectRatio(BaseAsset asset) async {
-    final dimension = asset is LocalAsset
+    bool isFlipped;
-        ? await _getLocalAssetDimensions(asset)
+    double? width;
-        : await _getRemoteAssetDimensions(asset as RemoteAsset);
+    double? height;
-
-    if (dimension.width == null || dimension.height == null || dimension.height == 0) {
-      return 1.0;
-    }
-
-    return dimension.isFlipped ? dimension.height! / dimension.width! : dimension.width! / dimension.height!;
-  }
-
-  Future<_AssetVideoDimension> _getLocalAssetDimensions(LocalAsset asset) async {
-    double? width = asset.width?.toDouble();
-    double? height = asset.height?.toDouble();
-    int orientation = asset.orientation;
-
-    if (width == null || height == null) {
-      final fetched = await _localAssetRepository.get(asset.id);
-      width = fetched?.width?.toDouble();
-      height = fetched?.height?.toDouble();
-      orientation = fetched?.orientation ?? 0;
-    }
-
-    // On Android, local assets need orientation correction for 90°/270° rotations
-    // On iOS, the Photos framework pre-corrects dimensions
-    final isFlipped = CurrentPlatform.isAndroid && (orientation == 90 || orientation == 270);
-    return (width: width, height: height, isFlipped: isFlipped);
-  }
-
-  Future<_AssetVideoDimension> _getRemoteAssetDimensions(RemoteAsset asset) async {
-    double? width = asset.width?.toDouble();
-    double? height = asset.height?.toDouble();
-
-    if (width == null || height == null) {
-      final fetched = await _remoteAssetRepository.get(asset.id);
-      width = fetched?.width?.toDouble();
-      height = fetched?.height?.toDouble();
-    }
 
+    if (asset.hasRemote) {
       final exif = await getExif(asset);
-    final isFlipped = ExifDtoConverter.isOrientationFlipped(exif?.orientation);
+      isFlipped = ExifDtoConverter.isOrientationFlipped(exif?.orientation);
-    return (width: width, height: height, isFlipped: isFlipped);
+      width = asset.width?.toDouble();
+      height = asset.height?.toDouble();
+    } else if (asset is LocalAsset) {
+      isFlipped = CurrentPlatform.isAndroid && (asset.orientation == 90 || asset.orientation == 270);
+      width = asset.width?.toDouble();
+      height = asset.height?.toDouble();
+    } else {
+      isFlipped = false;
+    }
+
+    if (width == null || height == null) {
+      if (asset.hasRemote) {
+        final id = asset is LocalAsset ? asset.remoteId! : (asset as RemoteAsset).id;
+        final remoteAsset = await _remoteAssetRepository.get(id);
+        width = remoteAsset?.width?.toDouble();
+        height = remoteAsset?.height?.toDouble();
+      } else {
+        final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).localId!;
+        final localAsset = await _localAssetRepository.get(id);
+        width = localAsset?.width?.toDouble();
+        height = localAsset?.height?.toDouble();
+      }
+    }
+
+    final orientedWidth = isFlipped ? height : width;
+    final orientedHeight = isFlipped ? width : height;
+    if (orientedWidth != null && orientedHeight != null && orientedHeight > 0) {
+      return orientedWidth / orientedHeight;
+    }
+
+    return 1.0;
   }
 
   Future<List<(String, String)>> getPlaces(String userId) {

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

@@ -12,8 +12,6 @@ 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.state.dart';
 import 'package:immich_mobile/presentation/widgets/map/map_utils.dart';
-import 'package:immich_mobile/providers/routes.provider.dart';
-import 'package:immich_mobile/routing/router.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';
@@ -116,14 +114,6 @@ class _DriftMapState extends ConsumerState<DriftMap> {
       return;
     }
 
-    // When the AssetViewer is open, the DriftMap route stays alive in the background.
-    // If we continue to update bounds, the map-scoped timeline service gets recreated and the previous one disposed,
-    // which can invalidate the TimelineService instance that was passed into AssetViewerRoute (causing "loading forever").
-    final currentRoute = ref.read(currentRouteNameProvider);
-    if (currentRoute == AssetViewerRoute.name || currentRoute == GalleryViewerRoute.name) {
-      return;
-    }
-
     final bounds = await controller.getVisibleRegion();
     unawaited(
       _reloadMutex.run(() async {

mobile/lib/presentation/widgets/timeline/fixed/row.dart

@@ -1,27 +1,45 @@
+import 'package:collection/collection.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 
-class FixedTimelineRow extends MultiChildRenderObjectWidget {
+class TimelineRow extends MultiChildRenderObjectWidget {
-  final double dimension;
+  final double height;
+  final List<double> widths;
   final double spacing;
   final TextDirection textDirection;
 
-  const FixedTimelineRow({
+  const TimelineRow({
     super.key,
-    required this.dimension,
+    required this.height,
+    required this.widths,
     required this.spacing,
     required this.textDirection,
     required super.children,
   });
 
+  factory TimelineRow.fixed({
+    required double dimension,
+    required double spacing,
+    required TextDirection textDirection,
+    required List<Widget> children,
+  }) => TimelineRow(
+    height: dimension,
+    widths: List.filled(children.length, dimension),
+    spacing: spacing,
+    textDirection: textDirection,
+    children: children,
+  );
+
   @override
   RenderObject createRenderObject(BuildContext context) {
-    return RenderFixedRow(dimension: dimension, spacing: spacing, textDirection: textDirection);
+    return RenderFixedRow(height: height, widths: widths, spacing: spacing, textDirection: textDirection);
   }
 
   @override
   void updateRenderObject(BuildContext context, RenderFixedRow renderObject) {
-    renderObject.dimension = dimension;
+    renderObject.height = height;
+    renderObject.widths = widths;
     renderObject.spacing = spacing;
     renderObject.textDirection = textDirection;
   }
@@ -29,7 +47,8 @@ class FixedTimelineRow extends MultiChildRenderObjectWidget {
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
     super.debugFillProperties(properties);
-    properties.add(DoubleProperty('dimension', dimension));
+    properties.add(DoubleProperty('height', height));
+    properties.add(DiagnosticsProperty<List<double>>('widths', widths));
     properties.add(DoubleProperty('spacing', spacing));
     properties.add(EnumProperty<TextDirection>('textDirection', textDirection));
   }
@@ -43,21 +62,32 @@ class RenderFixedRow extends RenderBox
         RenderBoxContainerDefaultsMixin<RenderBox, _RowParentData> {
   RenderFixedRow({
     List<RenderBox>? children,
-    required double dimension,
+    required double height,
+    required List<double> widths,
     required double spacing,
     required TextDirection textDirection,
-  }) : _dimension = dimension,
+  }) : _height = height,
+       _widths = widths,
        _spacing = spacing,
        _textDirection = textDirection {
     addAll(children);
   }
 
-  double get dimension => _dimension;
+  double get height => _height;
-  double _dimension;
+  double _height;
 
-  set dimension(double value) {
+  set height(double value) {
-    if (_dimension == value) return;
+    if (_height == value) return;
-    _dimension = value;
+    _height = value;
+    markNeedsLayout();
+  }
+
+  List<double> get widths => _widths;
+  List<double> _widths;
+
+  set widths(List<double> value) {
+    if (listEquals(_widths, value)) return;
+    _widths = value;
     markNeedsLayout();
   }
 
@@ -86,7 +116,7 @@ class RenderFixedRow extends RenderBox
     }
   }
 
-  double get intrinsicWidth => dimension * childCount + spacing * (childCount - 1);
+  double get intrinsicWidth => widths.sum + (spacing * (childCount - 1));
 
   @override
   double computeMinIntrinsicWidth(double height) => intrinsicWidth;
@@ -95,10 +125,10 @@ class RenderFixedRow extends RenderBox
   double computeMaxIntrinsicWidth(double height) => intrinsicWidth;
 
   @override
-  double computeMinIntrinsicHeight(double width) => dimension;
+  double computeMinIntrinsicHeight(double width) => height;
 
   @override
-  double computeMaxIntrinsicHeight(double width) => dimension;
+  double computeMaxIntrinsicHeight(double width) => height;
 
   @override
   double? computeDistanceToActualBaseline(TextBaseline baseline) {
@@ -118,7 +148,8 @@ class RenderFixedRow extends RenderBox
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
     super.debugFillProperties(properties);
-    properties.add(DoubleProperty('dimension', dimension));
+    properties.add(DoubleProperty('height', height));
+    properties.add(DiagnosticsProperty<List<double>>('widths', widths));
     properties.add(DoubleProperty('spacing', spacing));
     properties.add(EnumProperty<TextDirection>('textDirection', textDirection));
   }
@@ -131,19 +162,25 @@ class RenderFixedRow extends RenderBox
       return;
     }
     // Use the entire width of the parent for the row.
-    size = Size(constraints.maxWidth, dimension);
+    size = Size(constraints.maxWidth, height);
-    // Each tile is forced to be dimension x dimension.
+
-    final childConstraints = BoxConstraints.tight(Size(dimension, dimension));
     final flipMainAxis = textDirection == TextDirection.rtl;
-    Offset offset = Offset(flipMainAxis ? size.width - dimension : 0, 0);
+    int childIndex = 0;
-    final dx = (flipMainAxis ? -1 : 1) * (dimension + spacing);
+    double currentX = flipMainAxis ? size.width - (widths.firstOrNull ?? 0) : 0;
     // Layout each child horizontally.
-    while (child != null) {
+    while (child != null && childIndex < widths.length) {
+      final width = widths[childIndex];
+      final childConstraints = BoxConstraints.tight(Size(width, height));
       child.layout(childConstraints, parentUsesSize: false);
       final childParentData = child.parentData! as _RowParentData;
-      childParentData.offset = offset;
+      childParentData.offset = Offset(currentX, 0);
-      offset += Offset(dx, 0);
       child = childParentData.nextSibling;
+      childIndex++;
+
+      if (child != null && childIndex < widths.length) {
+        final nextWidth = widths[childIndex];
+        currentX += flipMainAxis ? -(spacing + nextWidth) : width + spacing;
+      }
     }
   }
 }

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

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:math' as math;
 
 import 'package:auto_route/auto_route.dart';
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -78,6 +79,7 @@ class FixedSegment extends Segment {
       assetCount: numberOfAssets,
       tileHeight: tileHeight,
       spacing: spacing,
+      columnCount: columnCount,
     );
   }
 }
@@ -87,24 +89,32 @@ class _FixedSegmentRow extends ConsumerWidget {
   final int assetCount;
   final double tileHeight;
   final double spacing;
+  final int columnCount;
 
   const _FixedSegmentRow({
     required this.assetIndex,
     required this.assetCount,
     required this.tileHeight,
     required this.spacing,
+    required this.columnCount,
   });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final isScrubbing = ref.watch(timelineStateProvider.select((s) => s.isScrubbing));
     final timelineService = ref.read(timelineServiceProvider);
+    final isDynamicLayout = columnCount <= 3;
 
     if (isScrubbing) {
       return _buildPlaceholder(context);
     }
     if (timelineService.hasRange(assetIndex, assetCount)) {
-      return _buildAssetRow(context, timelineService.getAssets(assetIndex, assetCount), timelineService);
+      return _buildAssetRow(
+        context,
+        timelineService.getAssets(assetIndex, assetCount),
+        timelineService,
+        isDynamicLayout,
+      );
     }
 
     return FutureBuilder<List<BaseAsset>>(
@@ -113,7 +123,7 @@ class _FixedSegmentRow extends ConsumerWidget {
         if (snapshot.connectionState != ConnectionState.done) {
           return _buildPlaceholder(context);
         }
-        return _buildAssetRow(context, snapshot.requireData, timelineService);
+        return _buildAssetRow(context, snapshot.requireData, timelineService, isDynamicLayout);
       },
     );
   }
@@ -122,12 +132,13 @@ class _FixedSegmentRow extends ConsumerWidget {
     return SegmentBuilder.buildPlaceholder(context, assetCount, size: Size.square(tileHeight), spacing: spacing);
   }
 
-  Widget _buildAssetRow(BuildContext context, List<BaseAsset> assets, TimelineService timelineService) {
+  Widget _buildAssetRow(
-    return FixedTimelineRow(
+    BuildContext context,
-      dimension: tileHeight,
+    List<BaseAsset> assets,
-      spacing: spacing,
+    TimelineService timelineService,
-      textDirection: Directionality.of(context),
+    bool isDynamicLayout,
-      children: [
+  ) {
+    final children = [
       for (int i = 0; i < assets.length; i++)
         TimelineAssetIndexWrapper(
           assetIndex: assetIndex + i,
@@ -138,7 +149,41 @@ class _FixedSegmentRow extends ConsumerWidget {
             assetIndex: assetIndex + i,
           ),
         ),
-      ],
+    ];
+
+    final widths = List.filled(assets.length, tileHeight);
+
+    if (isDynamicLayout) {
+      final aspectRatios = assets.map((e) => (e.width ?? 1) / (e.height ?? 1)).toList();
+      final meanAspectRatio = aspectRatios.sum / assets.length;
+
+      // 1: mean width
+      // 0.5: width < mean - threshold
+      // 1.5: width > mean + threshold
+      final arConfiguration = aspectRatios.map((e) {
+        if (e - meanAspectRatio > 0.3) return 1.5;
+        if (e - meanAspectRatio < -0.3) return 0.5;
+        return 1.0;
+      });
+
+      // Normalize to get width distribution
+      final sum = arConfiguration.sum;
+
+      int index = 0;
+      for (final ratio in arConfiguration) {
+        // Distribute the available width proportionally based on aspect ratio configuration
+        widths[index++] = ((ratio * assets.length) / sum) * tileHeight;
+      }
+    }
+
+    return TimelineDragRegion(
+      child: TimelineRow(
+        height: tileHeight,
+        widths: widths,
+        spacing: spacing,
+        textDirection: Directionality.of(context),
+        children: children,
+      ),
     );
   }
 }

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

@@ -24,7 +24,7 @@ abstract class SegmentBuilder {
     Size size = kTimelineFixedTileExtent,
     double spacing = kTimelineSpacing,
   }) => RepaintBoundary(
-    child: FixedTimelineRow(
+    child: TimelineRow.fixed(
       dimension: size.height,
       spacing: spacing,
       textDirection: Directionality.of(context),

mobile/lib/providers/asset_viewer/share_intent_upload.provider.dart

@@ -11,7 +11,6 @@ import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/share_intent_service.dart';
 import 'package:immich_mobile/services/upload.service.dart';
-import 'package:logging/logging.dart';
 import 'package:path/path.dart';
 
 final shareIntentUploadProvider = StateNotifierProvider<ShareIntentUploadStateNotifier, List<ShareIntentAttachment>>(
@@ -26,7 +25,6 @@ class ShareIntentUploadStateNotifier extends StateNotifier<List<ShareIntentAttac
   final AppRouter router;
   final UploadService _uploadService;
   final ShareIntentService _shareIntentService;
-  final Logger _logger = Logger('ShareIntentUploadStateNotifier');
 
   ShareIntentUploadStateNotifier(this.router, this._uploadService, this._shareIntentService) : super([]) {
     _uploadService.taskStatusStream.listen(_updateUploadStatus);
@@ -88,21 +86,6 @@ class ShareIntentUploadStateNotifier extends StateNotifier<List<ShareIntentAttac
       for (final attachment in state)
         if (attachment.id == taskId.toInt()) attachment.copyWith(status: uploadStatus) else attachment,
     ];
-
-    if (task.status == TaskStatus.failed) {
-      String? error;
-      final exception = task.exception;
-      if (exception != null && exception is TaskHttpException) {
-        final message = tryJsonDecode(exception.description)?['message'] as String?;
-        if (message != null) {
-          final responseCode = exception.httpResponseCode;
-          error = "${exception.exceptionType}, response code $responseCode: $message";
-        }
-      }
-      error ??= task.exception?.toString();
-
-      _logger.warning("Upload failed for asset: ${task.task.filename}, error: $error");
-    }
   }
 
   void _taskProgressCallback(TaskProgressUpdate update) {

mobile/lib/widgets/settings/asset_list_settings/asset_list_layout_settings.dart

@@ -1,6 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
@@ -20,6 +21,7 @@ class LayoutSettings extends HookConsumerWidget {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         SettingsSubTitle(title: "asset_list_layout_sub_title".tr()),
+        if (!Store.isBetaTimelineEnabled)
           SettingsSwitchListTile(
             valueNotifier: useDynamicLayout,
             title: "asset_list_layout_settings_dynamic_layout_title".tr(),

mobile/test/domain/services/asset.service_test.dart

@@ -87,25 +87,6 @@ void main() {
       verify(() => mockLocalAssetRepository.get('local-1')).called(1);
     });
 
-    test('uses fetched asset orientation when dimensions are missing on Android', () async {
-      debugDefaultTargetPlatformOverride = TargetPlatform.android;
-      addTearDown(() => debugDefaultTargetPlatformOverride = null);
-
-      // Original asset has default orientation 0, but dimensions are missing
-      final localAsset = TestUtils.createLocalAsset(id: 'local-1', width: null, height: null, orientation: 0);
-
-      // Fetched asset has 90° orientation and proper dimensions
-      final fetchedAsset = TestUtils.createLocalAsset(id: 'local-1', width: 1920, height: 1080, orientation: 90);
-
-      when(() => mockLocalAssetRepository.get('local-1')).thenAnswer((_) async => fetchedAsset);
-
-      final result = await sut.getAspectRatio(localAsset);
-
-      // Should flip dimensions since fetched asset has 90° orientation
-      expect(result, 1080 / 1920);
-      verify(() => mockLocalAssetRepository.get('local-1')).called(1);
-    });
-
     test('returns 1.0 when dimensions are still unavailable after fetching', () async {
       final remoteAsset = TestUtils.createRemoteAsset(id: 'remote-1', width: null, height: null);
 
@@ -131,9 +112,7 @@ void main() {
       expect(result, 1.0);
     });
 
-    test('handles local asset with remoteId using local orientation not remote exif', () async {
+    test('handles local asset with remoteId and uses exif from remote', () async {
-      // When a LocalAsset has a remoteId (merged), we should use local orientation
-      // because the width/height come from the local asset (pre-corrected on iOS)
       final localAsset = TestUtils.createLocalAsset(
         id: 'local-1',
         remoteId: 'remote-1',
@@ -142,24 +121,9 @@ void main() {
         orientation: 0,
       );
 
-      final result = await sut.getAspectRatio(localAsset);
+      final exif = const ExifInfo(orientation: '6');
 
-      expect(result, 1920 / 1080);
+      when(() => mockRemoteAssetRepository.getExif('remote-1')).thenAnswer((_) async => exif);
-      // Should not call remote exif for LocalAsset
-      verifyNever(() => mockRemoteAssetRepository.getExif(any()));
-    });
-
-    test('handles local asset with remoteId and 90 degree rotation on Android', () async {
-      debugDefaultTargetPlatformOverride = TargetPlatform.android;
-      addTearDown(() => debugDefaultTargetPlatformOverride = null);
-
-      final localAsset = TestUtils.createLocalAsset(
-        id: 'local-1',
-        remoteId: 'remote-1',
-        width: 1920,
-        height: 1080,
-        orientation: 90,
-      );
 
       final result = await sut.getAspectRatio(localAsset);
 

server/src/maintenance/maintenance-websocket.repository.ts

@@ -37,13 +37,7 @@ export class MaintenanceWebsocketRepository implements OnGatewayConnection, OnGa
 
   afterInit(websocketServer: Server) {
     this.logger.log('Initialized websocket server');
-
+    websocketServer.on('AppRestart', () => this.appRepository.exitApp());
-    websocketServer.on('AppRestart', (event: ArgsOf<'AppRestart'>, ack?: (ok: 'ok') => void) => {
-      this.logger.log(`Restarting due to event... ${JSON.stringify(event)}`);
-
-      ack?.('ok');
-      this.appRepository.exitApp();
-    });
   }
 
   clientBroadcast<T extends keyof ClientEventMap>(event: T, ...data: ClientEventMap[T]) {

server/src/repositories/app.repository.ts

@@ -1,10 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { createAdapter } from '@socket.io/redis-adapter';
-import Redis from 'ioredis';
-import { Server as SocketIO } from 'socket.io';
 import { ExitCode } from 'src/enum';
-import { ConfigRepository } from 'src/repositories/config.repository';
-import { AppRestartEvent } from 'src/repositories/event.repository';
 
 @Injectable()
 export class AppRepository {
@@ -22,26 +17,4 @@ export class AppRepository {
   setCloseFn(fn: () => Promise<void>) {
     this.closeFn = fn;
   }
-
-  async sendOneShotAppRestart(state: AppRestartEvent): Promise<void> {
-    const server = new SocketIO();
-    const { redis } = new ConfigRepository().getEnv();
-    const pubClient = new Redis({ ...redis, lazyConnect: true });
-    const subClient = pubClient.duplicate();
-
-    await Promise.all([pubClient.connect(), subClient.connect()]);
-
-    server.adapter(createAdapter(pubClient, subClient));
-
-    // => corresponds to notification.service.ts#onAppRestart
-    server.emit('AppRestartV1', state, async () => {
-      const responses = await server.serverSideEmitWithAck('AppRestart', state);
-      if (responses.some((response) => response !== 'ok')) {
-        throw new Error("One or more node(s) returned a non-'ok' response to our restart request!");
-      }
-
-      pubClient.disconnect();
-      subClient.disconnect();
-    });
-  }
 }

server/src/services/cli.service.spec.ts

@@ -89,7 +89,6 @@ describe(CliService.name, () => {
         alreadyDisabled: true,
       });
 
-      expect(mocks.app.sendOneShotAppRestart).toHaveBeenCalledTimes(0);
       expect(mocks.systemMetadata.set).toHaveBeenCalledTimes(0);
       expect(mocks.event.emit).toHaveBeenCalledTimes(0);
     });
@@ -100,7 +99,6 @@ describe(CliService.name, () => {
         alreadyDisabled: false,
       });
 
-      expect(mocks.app.sendOneShotAppRestart).toHaveBeenCalled();
       expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.MaintenanceMode, {
         isMaintenanceMode: false,
       });
@@ -116,7 +114,6 @@ describe(CliService.name, () => {
         }),
       );
 
-      expect(mocks.app.sendOneShotAppRestart).toHaveBeenCalledTimes(0);
       expect(mocks.systemMetadata.set).toHaveBeenCalledTimes(0);
       expect(mocks.event.emit).toHaveBeenCalledTimes(0);
     });
@@ -129,7 +126,6 @@ describe(CliService.name, () => {
         }),
       );
 
-      expect(mocks.app.sendOneShotAppRestart).toHaveBeenCalled();
       expect(mocks.systemMetadata.set).toHaveBeenCalledWith(SystemMetadataKey.MaintenanceMode, {
         isMaintenanceMode: true,
         secret: expect.stringMatching(/^\w{128}$/),

server/src/services/cli.service.ts

@@ -5,7 +5,7 @@ import { MaintenanceAuthDto } from 'src/dtos/maintenance.dto';
 import { UserAdminResponseDto, mapUserAdmin } from 'src/dtos/user.dto';
 import { SystemMetadataKey } from 'src/enum';
 import { BaseService } from 'src/services/base.service';
-import { createMaintenanceLoginUrl, generateMaintenanceSecret } from 'src/utils/maintenance';
+import { createMaintenanceLoginUrl, generateMaintenanceSecret, sendOneShotAppRestart } from 'src/utils/maintenance';
 import { getExternalDomain } from 'src/utils/misc';
 
 @Injectable()
@@ -55,7 +55,8 @@ export class CliService extends BaseService {
 
     const state = { isMaintenanceMode: false as const };
     await this.systemMetadataRepository.set(SystemMetadataKey.MaintenanceMode, state);
-    await this.appRepository.sendOneShotAppRestart(state);
+
+    sendOneShotAppRestart(state);
 
     return {
       alreadyDisabled: false,
@@ -88,7 +89,7 @@ export class CliService extends BaseService {
       secret,
     });
 
-    await this.appRepository.sendOneShotAppRestart({
+    sendOneShotAppRestart({
       isMaintenanceMode: true,
     });
 

server/src/services/maintenance.service.ts

@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
 import { OnEvent } from 'src/decorators';
 import { MaintenanceAuthDto } from 'src/dtos/maintenance.dto';
 import { SystemMetadataKey } from 'src/enum';
-import { ArgOf } from 'src/repositories/event.repository';
 import { BaseService } from 'src/services/base.service';
 import { MaintenanceModeState } from 'src/types';
 import { createMaintenanceLoginUrl, generateMaintenanceSecret, signMaintenanceJwt } from 'src/utils/maintenance';
@@ -32,10 +31,7 @@ export class MaintenanceService extends BaseService {
   }
 
   @OnEvent({ name: 'AppRestart', server: true })
-  onRestart(event: ArgOf<'AppRestart'>, ack?: (ok: 'ok') => void): void {
+  onRestart(): void {
-    this.logger.log(`Restarting due to event... ${JSON.stringify(event)}`);
-
-    ack?.('ok');
     this.appRepository.exitApp();
   }
 

server/src/utils/maintenance.ts

@@ -1,6 +1,55 @@
+import { createAdapter } from '@socket.io/redis-adapter';
+import Redis from 'ioredis';
 import { SignJWT } from 'jose';
 import { randomBytes } from 'node:crypto';
+import { Server as SocketIO } from 'socket.io';
 import { MaintenanceAuthDto } from 'src/dtos/maintenance.dto';
+import { ConfigRepository } from 'src/repositories/config.repository';
+import { AppRestartEvent } from 'src/repositories/event.repository';
+
+export function sendOneShotAppRestart(state: AppRestartEvent): void {
+  const server = new SocketIO();
+  const { redis } = new ConfigRepository().getEnv();
+  const pubClient = new Redis(redis);
+  const subClient = pubClient.duplicate();
+  server.adapter(createAdapter(pubClient, subClient));
+
+  /**
+   * Keep trying until we manage to stop Immich
+   *
+   * Sometimes there appear to be communication
+   * issues between to the other servers.
+   *
+   * This issue only occurs with this method.
+   */
+  async function tryTerminate() {
+    while (true) {
+      try {
+        const responses = await server.serverSideEmitWithAck('AppRestart', state);
+        if (responses.length > 0) {
+          return;
+        }
+      } catch (error) {
+        console.error(error);
+        console.error('Encountered an error while telling Immich to stop.');
+      }
+
+      console.info(
+        "\nIt doesn't appear that Immich stopped, trying again in a moment.\nIf Immich is already not running, you can ignore this error.",
+      );
+
+      await new Promise((r) => setTimeout(r, 1e3));
+    }
+  }
+
+  // => corresponds to notification.service.ts#onAppRestart
+  server.emit('AppRestartV1', state, () => {
+    void tryTerminate().finally(() => {
+      pubClient.disconnect();
+      subClient.disconnect();
+    });
+  });
+}
 
 export async function createMaintenanceLoginUrl(
   baseUrl: string,

web/src/lib/modals/SlideshowSettingsModal.svelte

@@ -14,7 +14,7 @@
   } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import SettingDropdown from '../components/shared-components/settings/setting-dropdown.svelte';
-  import { SlideshowLook, SlideshowNavigation, SlideshowState, slideshowStore } from '../stores/slideshow.store';
+  import { SlideshowLook, SlideshowNavigation, slideshowStore } from '../stores/slideshow.store';
 
   const {
     slideshowDelay,
@@ -23,7 +23,6 @@
     slideshowLook,
     slideshowTransition,
     slideshowAutoplay,
-    slideshowState,
   } = slideshowStore;
 
   interface Props {
@@ -70,7 +69,6 @@
     $slideshowLook = tempSlideshowLook;
     $slideshowTransition = tempSlideshowTransition;
     $slideshowAutoplay = tempSlideshowAutoplay;
-    $slideshowState = SlideshowState.PlaySlideshow;
     onClose();
   };
 </script>