(#51) Support for multiple callbacks

Author: s1hofmann

lib/screen.class.spec.ts

@@ -61,6 +61,26 @@ describe("Screen.", () => {
     expect(testCallback).toBeCalledWith(matchResult);
   });
 
+  it("should call multiple registered hooks before resolve", async () => {
+    const matchResult = new MatchResult(0.99, searchRegion);
+    VisionAdapter.prototype.findOnScreenRegion = jest.fn(() => {
+      return Promise.resolve(matchResult);
+    });
+    const visionAdapterMock = new VisionAdapter();
+
+    const SUT = new Screen(visionAdapterMock);
+    const testCallback = jest.fn(() => Promise.resolve());
+    const secondCallback = jest.fn(() => Promise.resolve());
+    const imagePath = "test/path/to/image.png";
+    SUT.on(imagePath, testCallback);
+    SUT.on(imagePath, secondCallback);
+    await SUT.find(imagePath);
+    for (const callback of [testCallback, secondCallback]) {
+      expect(callback).toBeCalledTimes(1);
+      expect(callback).toBeCalledWith(matchResult);
+    }
+  });
+
   it("should reject with insufficient confidence.", async () => {
     const matchResult = new MatchResult(0.8, searchRegion);
 

lib/screen.class.ts

@@ -19,7 +19,7 @@ export class Screen {
 
   constructor(
     private vision: VisionAdapter,
-    private findHooks: Map<string, FindHookCallback> = new Map<string, FindHookCallback>()) {
+    private findHooks: Map<string, FindHookCallback[]> = new Map<string, FindHookCallback[]>()) {
   }
 
   public width() {
@@ -53,9 +53,9 @@ export class Screen {
       try {
         const matchResult = await this.vision.findOnScreenRegion(matchRequest);
         if (matchResult.confidence >= minMatch) {
-          const possibleHook = this.findHooks.get(pathToNeedle);
-          if (possibleHook) {
-            await possibleHook(matchResult);
+          const possibleHooks = this.findHooks.get(pathToNeedle) || [];
+          for (const hook of possibleHooks) {
+            await hook(matchResult);
           }
           resolve(matchResult.location);
         } else {
@@ -82,7 +82,8 @@ export class Screen {
   }
 
   public on(pathToNeedle: string, callback: FindHookCallback) {
-    this.findHooks.set(pathToNeedle, callback);
+    const existingHooks = this.findHooks.get(pathToNeedle) || [];
+    this.findHooks.set(pathToNeedle, [...existingHooks, callback]);
   }
 
   public async capture(