High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: await sync asset v2 (#28569)
Brandon Weesdc66892ca162
diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dartindex d73f3f1963..9f01a68f03 100644--- a/mobile/lib/providers/infrastructure/action.provider.dart+++ b/mobile/lib/providers/infrastructure/action.provider.dart@@ -14,6 +14,7 @@ import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.daimport 'package:immich_mobile/providers/infrastructure/asset.provider.dart';import 'package:immich_mobile/providers/infrastructure/asset_viewer/asset.provider.dart' show assetExifProvider;import 'package:immich_mobile/providers/infrastructure/tag.provider.dart';+import 'package:immich_mobile/providers/server_info.provider.dart';import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';import 'package:immich_mobile/providers/user.provider.dart';import 'package:immich_mobile/providers/websocket.provider.dart';@@ -21,6 +22,7 @@ import 'package:immich_mobile/routing/router.dart';import 'package:immich_mobile/services/action.service.dart';import 'package:immich_mobile/services/download.service.dart';import 'package:immich_mobile/services/foreground_upload.service.dart';+import 'package:immich_mobile/utils/semver.dart';import 'package:immich_mobile/widgets/asset_grid/delete_dialog.dart';import 'package:logging/logging.dart';import 'package:openapi/api.dart';@@ -536,14 +538,22 @@ class ActionNotifier extends Notifier<void> {return ActionResult(count: ids.length, success: false, error: 'Expected single asset for applying edits');}- final completer = ref.read(websocketProvider.notifier).waitForEvent("AssetEditReadyV1", (dynamic data) {- final eventAsset = SyncAssetV1.fromJson(data["asset"]);- return eventAsset?.id == ids.first;- }, const Duration(seconds: 10));+ Future<void> editReady;+ if (ref.read(serverInfoProvider).serverVersion >= const SemVer(major: 3, minor: 0, patch: 0)) {+ editReady = ref.read(websocketProvider.notifier).waitForEvent("AssetEditReadyV2", (dynamic data) {+ final eventAsset = SyncAssetV2.fromJson(data["asset"]);+ return eventAsset?.id == ids.first;+ }, const Duration(seconds: 10));+ } else {+ editReady = ref.read(websocketProvider.notifier).waitForEvent("AssetEditReadyV1", (dynamic data) {+ final eventAsset = SyncAssetV1.fromJson(data["asset"]);+ return eventAsset?.id == ids.first;+ }, const Duration(seconds: 10));+ }try {await _service.applyEdits(ids.first, edits);- await completer;+ await editReady;return const ActionResult(count: 1, success: true);} catch (error, stack) {_logger.severe('Failed to apply edits to assets', error, stack);diff --git a/web/src/lib/managers/edit/edit-manager.svelte.ts b/web/src/lib/managers/edit/edit-manager.svelte.tsindex 083a446938..dc454f854a 100644--- a/web/src/lib/managers/edit/edit-manager.svelte.ts+++ b/web/src/lib/managers/edit/edit-manager.svelte.ts@@ -127,7 +127,7 @@ export class EditManager {try {// Setup the websocket listener before sending the edit request- const editCompleted = waitForWebsocketEvent('AssetEditReadyV1', (event) => event.asset.id === assetId, 10_000);+ const editCompleted = waitForWebsocketEvent('AssetEditReadyV2', (event) => event.asset.id === assetId, 10_000);await (edits.length === 0? removeAssetEdits({ id: assetId })diff --git a/web/src/lib/stores/websocket.ts b/web/src/lib/stores/websocket.tsindex e5cc25bcf9..5765f85a16 100644--- a/web/src/lib/stores/websocket.ts+++ b/web/src/lib/stores/websocket.ts@@ -5,7 +5,7 @@ import {type NotificationDto,type ServerVersionResponseDto,type SyncAssetEditV1,- type SyncAssetV1,+ type SyncAssetV2,} from '@immich/sdk';import { io, type Socket } from 'socket.io-client';import { get, writable } from 'svelte/store';@@ -41,7 +41,7 @@ export interface Events {AppRestartV1: (event: AppRestartEvent) => void;MaintenanceStatusV1: (event: MaintenanceStatusResponseDto) => void;- AssetEditReadyV1: (data: { asset: SyncAssetV1; edit: SyncAssetEditV1[] }) => void;+ AssetEditReadyV2: (data: { asset: SyncAssetV2; edit: SyncAssetEditV1[] }) => void;}const websocket: Socket<Events> = io({