wait for event refactor

server/e2e/jobs/specs/library-watcher.e2e-spec.ts

@@ -84,10 +84,7 @@ describe(`Library watcher (e2e)`, () => {
           `${IMMICH_TEST_ASSET_TEMP_PATH}/file5.jPg`,
         );
 
-        await waitForEvent(libraryService, StorageEvent.ADD);
+        await waitForEvent(libraryService, StorageEvent.ADD, 4);
-        await waitForEvent(libraryService, StorageEvent.ADD);
-        await waitForEvent(libraryService, StorageEvent.ADD);
-        await waitForEvent(libraryService, StorageEvent.ADD);
 
         const afterAssets = await api.assetApi.getAllAssets(server, admin.accessToken);
         expect(afterAssets.length).toEqual(4);
@@ -161,9 +158,7 @@ describe(`Library watcher (e2e)`, () => {
           `${IMMICH_TEST_ASSET_TEMP_PATH}/dir3/file4.jpg`,
         );
 
-        await waitForEvent(libraryService, StorageEvent.ADD);
+        await waitForEvent(libraryService, StorageEvent.ADD, 3);
-        await waitForEvent(libraryService, StorageEvent.ADD);
-        await waitForEvent(libraryService, StorageEvent.ADD);
 
         const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
         expect(assets.length).toEqual(3);

server/src/test-utils/utils.ts

@@ -138,19 +138,26 @@ export const testApp = {
   },
 };
 
-export function waitForEvent<T>(emitter: EventEmitter, event: string): Promise<T> {
+export function waitForEvent(emitter: EventEmitter, event: string, times = 1): Promise<void[]> {
-  return new Promise((resolve, reject) => {
+  const promises: Promise<void>[] = [];
-    const success = (value: T) => {
+
-      emitter.off(StorageEvent.ERROR, fail);
+  for (let i = 1; i <= times; i++) {
-      resolve(value);
+    promises.push(
-    };
+      new Promise((resolve, reject) => {
-    const fail = (error: Error) => {
+        const success = (value: any) => {
-      emitter.off(event, success);
+          emitter.off(StorageEvent.ERROR, fail);
-      reject(error);
+          resolve(value);
-    };
+        };
-    emitter.once(event, success);
+        const fail = (error: Error) => {
-    emitter.once(StorageEvent.ERROR, fail);
+          emitter.off(event, success);
-  });
+          reject(error);
+        };
+        emitter.once(event, success);
+        emitter.once(StorageEvent.ERROR, fail);
+      }),
+    );
+  }
+  return Promise.all(promises);
 }
 
 const directoryExists = async (dirPath: string) =>