Merge branch 'main' into feat/workflow-webhooks

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

@@ -446,7 +446,6 @@ class SyncStreamService {
 
       await _syncStreamRepository.updateAssetsV1([asset], debugLabel: 'websocket-edit');
       await _syncStreamRepository.replaceAssetEditsV1(asset.id, assetEdits, debugLabel: 'websocket-edit');
-      await _refreshAssetOcrAndFaces(asset.id);
 
       _logger.info(
         'Successfully processed AssetEditReadyV1 event for asset ${asset.id} with ${assetEdits.length} edits',
@@ -485,7 +484,6 @@ class SyncStreamService {
 
       await _syncStreamRepository.updateAssetsV2([asset], debugLabel: 'websocket-edit');
       await _syncStreamRepository.replaceAssetEditsV1(asset.id, assetEdits, debugLabel: 'websocket-edit');
-      await _refreshAssetOcrAndFaces(asset.id);
 
       _logger.info(
         'Successfully processed AssetEditReadyV2 event for asset ${asset.id} with ${assetEdits.length} edits',
@@ -495,22 +493,6 @@ class SyncStreamService {
     }
   }
 
-  Future<void> _refreshAssetOcrAndFaces(String assetId) async {
-    try {
-      final ocr = await _api.assetsApi.getAssetOcr(assetId);
-      await _syncStreamRepository.replaceAssetOcr(assetId, ocr ?? const []);
-    } catch (error, stackTrace) {
-      _logger.severe("Error refreshing OCR for asset $assetId", error, stackTrace);
-    }
-
-    try {
-      final faces = await _api.facesApi.getFaces(assetId);
-      await _syncStreamRepository.replaceAssetFaces(assetId, faces ?? const []);
-    } catch (error, stackTrace) {
-      _logger.severe("Error refreshing faces for asset $assetId", error, stackTrace);
-    }
-  }
-
   Future<void> _handleRemoteDeleted(Iterable<String> remoteIds) async {
     if (remoteIds.isEmpty) {
       return Future.value();

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

@@ -896,71 +896,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
     }
   }
 
-  /// Replaces all OCR rows for [assetId] with [data] (e.g. after an asset edit re-runs OCR).
-  Future<void> replaceAssetOcr(String assetId, Iterable<AssetOcrResponseDto> data) async {
-    try {
-      await _db.batch((batch) {
-        batch.deleteWhere(_db.assetOcrEntity, (row) => row.assetId.equals(assetId));
-
-        for (final ocr in data) {
-          batch.insert(
-            _db.assetOcrEntity,
-            AssetOcrEntityCompanion(
-              id: Value(ocr.id),
-              assetId: Value(ocr.assetId),
-              recognizedText: Value(ocr.text),
-              x1: Value(ocr.x1),
-              y1: Value(ocr.y1),
-              x2: Value(ocr.x2),
-              y2: Value(ocr.y2),
-              x3: Value(ocr.x3),
-              y3: Value(ocr.y3),
-              x4: Value(ocr.x4),
-              y4: Value(ocr.y4),
-              boxScore: Value(ocr.boxScore),
-              textScore: Value(ocr.textScore),
-              isVisible: const Value(true),
-            ),
-          );
-        }
-      });
-    } catch (error, stack) {
-      _logger.severe('Error: replaceAssetOcr', error, stack);
-      rethrow;
-    }
-  }
-
-  Future<void> replaceAssetFaces(String assetId, Iterable<AssetFaceResponseDto> data) async {
-    try {
-      await _db.batch((batch) {
-        batch.deleteWhere(_db.assetFaceEntity, (row) => row.assetId.equals(assetId));
-
-        for (final face in data) {
-          batch.insert(
-            _db.assetFaceEntity,
-            AssetFaceEntityCompanion(
-              id: Value(face.id),
-              assetId: Value(assetId),
-              personId: Value(face.person?.id),
-              imageWidth: Value(face.imageWidth),
-              imageHeight: Value(face.imageHeight),
-              boundingBoxX1: Value(face.boundingBoxX1),
-              boundingBoxY1: Value(face.boundingBoxY1),
-              boundingBoxX2: Value(face.boundingBoxX2),
-              boundingBoxY2: Value(face.boundingBoxY2),
-              sourceType: Value(face.sourceType.orElse(null)?.value ?? SourceType.machineLearning.value),
-              isVisible: const Value(true),
-              deletedAt: const Value(null),
-            ),
-          );
-        }
-      });
-    } catch (error, stack) {
-      _logger.severe('Error: replaceAssetFaces', error, stack);
-      rethrow;
-    }
-  }
-
   Future<void> pruneAssets() async {
     try {
       await _db.transaction(() async {

mobile/lib/providers/websocket.provider.dart

@@ -7,7 +7,6 @@ import 'package:immich_mobile/infrastructure/repositories/network.repository.dar
 import 'package:immich_mobile/models/server_info/server_version.model.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/ocr.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/utils/debounce.dart';
@@ -182,34 +181,11 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
   }
 
   void _handleSyncAssetEditReadyV1(dynamic data) {
-    final assetId = _assetIdFromEditReady(data);
-    unawaited(
-      _ref.read(backgroundSyncProvider).syncWebsocketEditV1(data).whenComplete(() => _onAssetEditApplied(assetId)),
-    );
+    unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEditV1(data));
   }
 
   void _handleSyncAssetEditReadyV2(dynamic data) {
-    final assetId = _assetIdFromEditReady(data);
-    unawaited(
-      _ref.read(backgroundSyncProvider).syncWebsocketEditV2(data).whenComplete(() => _onAssetEditApplied(assetId)),
-    );
-  }
-
-  String? _assetIdFromEditReady(dynamic data) {
-    if (data is Map && data['asset'] is Map) {
-      final id = (data['asset'] as Map)['id'];
-      return id is String ? id : null;
-    }
-    return null;
-  }
-
-  /// The edit handler refreshes OCR/faces in the drift DB from a background isolate,
-  /// so the main-isolate UI providers must be invalidated here to re-read the new data.
-  void _onAssetEditApplied(String? assetId) {
-    if (assetId == null) {
-      return;
-    }
-    _ref.invalidate(ocrAssetProvider(assetId));
+    unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEditV2(data));
   }
 
   void _processBatchedAssetUploadReadyV1() {

mobile/lib/services/api.service.dart

@@ -36,7 +36,6 @@ class ApiService {
   late MemoriesApi memoriesApi;
   late SessionsApi sessionsApi;
   late TagsApi tagsApi;
-  late FacesApi facesApi;
 
   ApiService() {
     // The below line ensures that the api clients are initialized when the service is instantiated
@@ -78,7 +77,6 @@ class ApiService {
     memoriesApi = MemoriesApi(_apiClient);
     sessionsApi = SessionsApi(_apiClient);
     tagsApi = TagsApi(_apiClient);
-    facesApi = FacesApi(_apiClient);
   }
 
   Future<String> resolveAndSetEndpoint(String serverUrl) async {

packages/plugin-core/manifest.json

@@ -291,6 +291,40 @@
         "required": ["albumIds"]
       }
     },
+    {
+      "name": "assetDataWebhook",
+      "title": "Trigger Webhook",
+      "description": "POST/PUT event data to any URL",
+      "types": ["AssetV1"],
+      "hostFunctions": true,
+      "schema": {
+        "type": "object",
+        "properties": {
+          "url": {
+            "type": "string",
+            "title": "URL",
+            "description": "Event data will be PUT/POSTed to this URL as a JSON object"
+          },
+          "headerName": {
+            "type": "string",
+            "title": "Header name",
+            "description": "The name of an additional header to include with the request (e.g. authentication)"
+          },
+          "headerValue": {
+            "type": "string",
+            "title": "Header value",
+            "description": "The value of the additional header"
+          },
+          "method": {
+            "type": "string",
+            "title": "Method",
+            "description": "The HTTP method to use in the request",
+            "enum": ["POST", "PUT"]
+          }
+        },
+        "required": ["url"]
+      }
+    },
     {
       "name": "noop1",
       "title": "DEV: Nested properties",

packages/plugin-core/src/index.d.ts

@@ -24,4 +24,5 @@ declare module 'main' {
   export function assetTimeline(): I32;
   export function assetTrash(): I32;
   export function assetAddToAlbums(): I32;
+  export function assetDataWebhook(): I32;
 }

packages/plugin-core/src/index.ts

@@ -181,3 +181,23 @@ export const assetAddToAlbums = () => {
     return {};
   });
 };
+
+export const assetDataWebhook = () => {
+  return wrapper<WorkflowType.AssetV1, { url: string; headerName?: string; headerValue?: string; method?: string }>(
+    ({ config, data }) => {
+      const headers = new Headers({ 'Content-Type': 'application/json' });
+
+      if (config.headerName && config.headerValue) {
+        headers.set(config.headerName, config.headerValue);
+      }
+
+      fetch(config.url, {
+        method: config.method ?? 'POST',
+        body: JSON.stringify(data.asset),
+        headers,
+      });
+
+      return {};
+    },
+  );
+};

packages/plugin-core/tsconfig.json

@@ -4,7 +4,7 @@
     "declaration": true,
     "emitDeclarationOnly": true,
     "esModuleInterop": true, // Enables compatibility with Babel-style module imports
-    "lib": ["es2020"], // Specify a list of library files to be included in the compilation
+    "lib": ["es2020", "DOM"], // Specify a list of library files to be included in the compilation
     "module": "nodenext", // Specify module code generation
     "moduleResolution": "nodenext",
     "noEmit": true, // Do not emit outputs (no .js or .d.ts files)

packages/plugin-sdk/src/host-functions.ts

@@ -33,6 +33,11 @@ type HostFunctionResult<T> =
 
 type QueryParams<T extends (...args: any) => any> = Parameters<T>[0];
 type AlbumSearchDto = QueryParams<typeof getAllAlbums>;
+type HttpRequestOptions = {
+  method?: string;
+  headers?: Record<string, string>;
+  body?: string;
+};
 
 export const hostFunctions = (authToken: string) => {
   const host = Host.getFunctions();

server/src/repositories/plugin.repository.ts

@@ -216,6 +216,7 @@ export class PluginRepository {
               functions: {
                 'extism:host/user': functions ?? {},
               },
+              allowedHosts: runInWorker ? ['*'] : [],
               logger: {
                 trace: (message) => logger.verbose(message),
                 info: (message) => logger.log(message),