feat(core-webhooks): dispatch webhook events (#3771)

ArkEcosystem · Jun 4, 2020 · 7ca7d96 · 7ca7d96
1 parent b87a7a8
commit 7ca7d96
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 12 deletions.
diff --git a/__tests__/unit/core-webhooks/listener.test.ts b/__tests__/unit/core-webhooks/listener.test.ts
@@ -1,17 +1,19 @@
 import "jest-extended";
 
-import { Application } from "@packages/core-kernel/src/application";
 import { Container, Utils } from "@packages/core-kernel";
+import { HttpOptions, HttpResponse } from "@packages/core-kernel/src/utils";
+import { Sandbox } from "@packages/core-test-framework";
+import * as coditions from "@packages/core-webhooks/src/conditions";
 import { Database } from "@packages/core-webhooks/src/database";
+import { WebhookEvent } from "@packages/core-webhooks/src/events";
 import { Identifiers } from "@packages/core-webhooks/src/identifiers";
-import { Listener } from "@packages/core-webhooks/src/listener";
 import { Webhook } from "@packages/core-webhooks/src/interfaces";
+import { Listener } from "@packages/core-webhooks/src/listener";
 import { dirSync, setGracefulCleanup } from "tmp";
-import { HttpOptions, HttpResponse } from "@packages/core-kernel/src/utils";
+
 import { dummyWebhook } from "./__fixtures__/assets";
-import * as coditions from "@packages/core-webhooks/src/conditions";
 
-let app: Application;
+let sandbox: Sandbox;
 let database: Database;
 let listener: Listener;
 let webhook: Webhook;
@@ -21,20 +23,42 @@ const logger = {
     error: jest.fn(),
 };
 
+const mockEventDispatcher = {
+    dispatch: jest.fn(),
+};
+
 let spyOnPost: jest.SpyInstance;
 
+const expectFinishedEventData = () => {
+    return expect.objectContaining({
+        executionTime: expect.toBeNumber(),
+        webhook: expect.toBeObject(),
+        payload: expect.anything(),
+    });
+};
+
+const expectFailedEventData = () => {
+    return expect.objectContaining({
+        executionTime: expect.toBeNumber(),
+        webhook: expect.toBeObject(),
+        payload: expect.anything(),
+        error: expect.toBeObject(),
+    });
+};
+
 beforeEach(() => {
-    app = new Application(new Container.Container());
-    app.bind("path.cache").toConstantValue(dirSync().name);
+    sandbox = new Sandbox();
+    sandbox.app.bind("path.cache").toConstantValue(dirSync().name);
 
-    app.bind<Database>(Identifiers.Database).to(Database).inSingletonScope();
+    sandbox.app.bind(Container.Identifiers.EventDispatcherService).toConstantValue(mockEventDispatcher);
+    sandbox.app.bind<Database>(Identifiers.Database).to(Database).inSingletonScope();
 
-    app.bind(Container.Identifiers.LogService).toConstantValue(logger);
+    sandbox.app.bind(Container.Identifiers.LogService).toConstantValue(logger);
 
-    database = app.get<Database>(Identifiers.Database);
+    database = sandbox.app.get<Database>(Identifiers.Database);
     database.boot();
 
-    listener = app.resolve<Listener>(Listener);
+    listener = sandbox.app.resolve<Listener>(Listener);
 
     webhook = Object.assign({}, dummyWebhook);
 
@@ -48,6 +72,7 @@ beforeEach(() => {
 });
 
 afterEach(() => {
+    jest.clearAllMocks();
     jest.resetAllMocks();
 });
 
@@ -62,6 +87,12 @@ describe("Listener", () => {
 
             expect(spyOnPost).toHaveBeenCalled();
             expect(logger.debug).toHaveBeenCalled();
+
+            expect(mockEventDispatcher.dispatch).toHaveBeenCalledTimes(1);
+            expect(mockEventDispatcher.dispatch).toHaveBeenCalledWith(
+                WebhookEvent.Broadcasted,
+                expectFinishedEventData(),
+            );
         });
 
         it("should log error if broadcast is not successful", async () => {
@@ -77,6 +108,9 @@ describe("Listener", () => {
 
             expect(spyOnPost).toHaveBeenCalled();
             expect(logger.error).toHaveBeenCalled();
+
+            expect(mockEventDispatcher.dispatch).toHaveBeenCalledTimes(1);
+            expect(mockEventDispatcher.dispatch).toHaveBeenCalledWith(WebhookEvent.Failed, expectFailedEventData());
         });
     });
 
@@ -90,6 +124,14 @@ describe("Listener", () => {
             expect(spyOnPost).toHaveBeenCalledTimes(0);
         });
 
+        it("should not broadcast if event is webhook event", async () => {
+            database.create(webhook);
+
+            await listener.handle({ name: WebhookEvent.Broadcasted, data: "dummy_data" });
+
+            expect(spyOnPost).toHaveBeenCalledTimes(0);
+        });
+
         it("should broadcast if webhook condition is satisfied", async () => {
             webhook.conditions = [
                 {
@@ -103,6 +145,12 @@ describe("Listener", () => {
             await listener.handle({ name: "event", data: { test: 1 } });
 
             expect(spyOnPost).toHaveBeenCalledTimes(1);
+
+            expect(mockEventDispatcher.dispatch).toHaveBeenCalledTimes(1);
+            expect(mockEventDispatcher.dispatch).toHaveBeenCalledWith(
+                WebhookEvent.Broadcasted,
+                expectFinishedEventData(),
+            );
         });
 
         it("should not broadcast if webhook condition is not satisfied", async () => {
@@ -121,7 +169,7 @@ describe("Listener", () => {
         });
 
         it("should not broadcast if webhook condition throws error", async () => {
-            let spyOnEq = jest.spyOn(coditions, "eq").mockImplementation((actual, expected) => {
+            const spyOnEq = jest.spyOn(coditions, "eq").mockImplementation((actual, expected) => {
                 throw new Error();
             });
 

diff --git a/packages/core-webhooks/src/events.ts b/packages/core-webhooks/src/events.ts
@@ -0,0 +1,4 @@
+export enum WebhookEvent {
+    Broadcasted = "webhooks.broadcasted",
+    Failed = "webhooks.failed",
+}
diff --git a/packages/core-webhooks/src/listener.ts b/packages/core-webhooks/src/listener.ts
@@ -1,7 +1,9 @@
 import { Container, Contracts, Utils } from "@arkecosystem/core-kernel";
+import { performance } from "perf_hooks";
 
 import * as conditions from "./conditions";
 import { Database } from "./database";
+import { WebhookEvent } from "./events";
 import { Identifiers } from "./identifiers";
 import { Webhook } from "./interfaces";
 
@@ -31,6 +33,11 @@ export class Listener {
      * @memberof Listener
      */
     public async handle({ name, data }): Promise<void> {
+        // Skip own events to prevent cycling
+        if (name.toString().includes("webhooks")) {
+            return;
+        }
+
         const webhooks: Webhook[] = this.getWebhooks(name, data);
 
         for (const webhook of webhooks) {
@@ -45,6 +52,8 @@ export class Listener {
      * @memberof Broadcaster
      */
     public async broadcast(webhook: Webhook, payload: object, timeout: number = 1500): Promise<void> {
+        const start = performance.now();
+
         try {
             const { statusCode } = await Utils.http.post(webhook.target, {
                 body: {
@@ -61,8 +70,29 @@ export class Listener {
             this.logger.debug(
                 `Webhooks Job ${webhook.id} completed! Event [${webhook.event}] has been transmitted to [${webhook.target}] with a status of [${statusCode}].`,
             );
+
+            await this.dispatchWebhookEvent(start, webhook, payload);
         } catch (error) {
             this.logger.error(`Webhooks Job ${webhook.id} failed: ${error.message}`);
+
+            await this.dispatchWebhookEvent(start, webhook, payload, error);
+        }
+    }
+
+    private async dispatchWebhookEvent(start: number, webhook: Webhook, payload: object, err?: Error) {
+        if (err) {
+            this.app.events.dispatch(WebhookEvent.Failed, {
+                executionTime: performance.now() - start,
+                webhook: webhook,
+                payload: payload,
+                error: err,
+            });
+        } else {
+            this.app.events.dispatch(WebhookEvent.Broadcasted, {
+                executionTime: performance.now() - start,
+                webhook: webhook,
+                payload: payload,
+            });
         }
     }