npm - @alanszp/eventbridge-client - Versions diffs - 7.4.1 → 7.4.3 - Mend

@alanszp/eventbridge-client 7.4.1 → 7.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/babel.config.js +7 -0
package/dist/basicEventbridgeClient.js +27 -5
package/dist/basicEventbridgeClient.js.map +1 -1
package/dist/basicEventbridgeClient.test.d.ts +1 -0
package/dist/basicEventbridgeClient.test.js +74 -0
package/dist/basicEventbridgeClient.test.js.map +1 -0
package/dist/mockEventbridgeClient.d.ts +4 -0
package/dist/mockEventbridgeClient.js +11 -0
package/dist/mockEventbridgeClient.js.map +1 -0
package/dist/mocks/fixtures/eventbridgeFixture.d.ts +54 -0
package/dist/mocks/fixtures/eventbridgeFixture.js +104 -0
package/dist/mocks/fixtures/eventbridgeFixture.js.map +1 -0
package/jest.config.js +10 -0
package/package.json +7 -2
package/src/basicEventbridgeClient.test.ts +89 -0
package/src/basicEventbridgeClient.ts +48 -16
package/src/mockEventbridgeClient.ts +11 -0
package/src/mocks/fixtures/eventbridgeFixture.ts +105 -0
package/tsconfig.json +5 -2

package/babel.config.js ADDED Viewed

@@ -0,0 +1,7 @@
+// Used by Jest
+module.exports = {
+  presets: [
+    ["@babel/preset-env", { targets: { node: "current" } }],
+    "@babel/preset-typescript",
+  ],
+};

package/dist/basicEventbridgeClient.js CHANGED Viewed

@@ -13,6 +13,10 @@ exports.BasicEventbridgeClient = void 0;
 const lodash_1 = require("lodash");
 const aws_1 = require("./aws");
 const mapLaraEventToAWSEvent_1 = require("./helpers/mapLaraEventToAWSEvent");
+/**
+ * Max batch size for the putEvents request defined by AWS.
+ */
+const MAX_BATCH_SIZE = 10;
 /**
  * Basic client for Eventbridge.
  * Usage will be done by extending this class and implementing methods that internally call the protected sendEvents method.
@@ -28,11 +32,29 @@ class BasicEventbridgeClient {
     sendEvents(events) {
         return __awaiter(this, void 0, void 0, function* () {
             const logger = this.getLogger();
-            const eventsToSend = {
-                Entries: (0, lodash_1.compact)(events.map((event) => (0, mapLaraEventToAWSEvent_1.mapLaraEventToAWSEvent)(event, this.env, this.appName, this.bus, logger, this.context))),
-            };
-            const result = yield aws_1.eventbridgeClient.putEvents(eventsToSend).promise();
-            const { Entries, FailedEntryCount: failedCount } = result;
+            const eventsToSend = (0, lodash_1.chain)(events)
+                .map((event) => (0, mapLaraEventToAWSEvent_1.mapLaraEventToAWSEvent)(event, this.env, this.appName, this.bus, logger, this.context))
+                .compact()
+                .chunk(MAX_BATCH_SIZE)
+                .map((mappedEventsChunk) => ({
+                Entries: mappedEventsChunk,
+            }))
+                .value();
+            const results = yield Promise.all(eventsToSend.map((events) => aws_1.eventbridgeClient
+                .putEvents(events)
+                .promise()));
+            const aggregatedResult = results.reduce((prev, act) => {
+                const { Entries: NewEntries, FailedEntryCount: newFailedCount } = act;
+                const { Entries, FailedEntryCount } = prev;
+                return {
+                    Entries: [...(Entries || []), ...(NewEntries || [])],
+                    FailedEntryCount: (FailedEntryCount || 0) + (newFailedCount || 0),
+                };
+            }, {
+                Entries: [],
+                FailedEntryCount: 0,
+            });
+            const { Entries, FailedEntryCount: failedCount } = aggregatedResult;
             const [successful, failed] = (0, lodash_1.partition)(Entries, (entry) => entry.EventId);
             logger.info("eventbridge.client.sendEvents.end", {
                 successful,

package/dist/basicEventbridgeClient.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"basicEventbridgeClient.js","sourceRoot":"","sources":["../src/basicEventbridgeClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,~~mCAA4C~~;~~AAC5C~~,+BAA+E;AAC/E,6EAA0E;AAoB1E;;;GAGG;AACH,MAAa,sBAAsB;IAQjC,YACE,OAAe,EACf,GAAW,EACX,SAAwB,EACxB,OAAsB,EACtB,GAAW;QAEX,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEe,UAAU,CACxB,MAAmB;;YAEnB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAEhC,MAAM,YAAY,~~GAAiB;gBACjC~~,~~OAAO,EAAE,~~IAAA,~~gBAAO~~,~~EACd~~,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,~~CACnB~~,IAAA,+CAAsB,EACpB,KAAK,EACL,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,GAAG,EACR,MAAM,EACN,IAAI,CAAC,OAAO,CACb,CACF,~~CACF~~;~~aACF~~,CAAC;~~YAEF~~,MAAM,MAAM,GAAG,MAAM,uBAAiB,CAAC,~~SAAS~~,CAAC,~~YAAY~~,CAAC,CAAC,OAAO,EAAE,CAAC;~~YACzE~~,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,~~WAAW~~,EAAE,GAAG,MAAM,CAAC;~~YAC1D~~,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,IAAA,kBAAS,EAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAE1E,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE;gBAC/C,UAAU;gBACV,MAAM;aACP,CAAC,CAAC;YAEH,OAAO;gBACL,UAAU;gBACV,MAAM;gBACN,WAAW;aACZ,CAAC;QACJ,CAAC;KAAA;CACF;~~AAzDD~~,~~wDAyDC~~"}
1	+ {"version":3,"file":"basicEventbridgeClient.js","sourceRoot":"","sources":["../src/basicEventbridgeClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,mCAA0D;AAC1D,+BAA+E;AAC/E,6EAA0E;AAoB1E;;GAEG;AACH,MAAM,cAAc,GAAG,EAAE,CAAC;AAE1B;;;GAGG;AACH,MAAa,sBAAsB;IAQjC,YACE,OAAe,EACf,GAAW,EACX,SAAwB,EACxB,OAAsB,EACtB,GAAW;QAEX,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEe,UAAU,CACxB,MAAmB;;YAEnB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAEhC,MAAM,YAAY,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC;iBAC/B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACb,IAAA,+CAAsB,EACpB,KAAK,EACL,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,GAAG,EACR,MAAM,EACN,IAAI,CAAC,OAAO,CACb,CACF;iBACA,OAAO,EAAE;iBACT,KAAK,CAAC,cAAc,CAAC;iBACrB,GAAG,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;gBAC3B,OAAO,EAAE,iBAAiB;aAC3B,CAAC,CAAC;iBACF,KAAK,EAAE,CAAC;YAEX,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC1B,uBAAiB;iBACd,SAAS,CAAC,MAAM,CAAC;iBACjB,OAAO,EAAE,CACb,CACF,CAAC;YAEF,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,CACrC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;gBACZ,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC;gBACtE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;gBAE3C,OAAO;oBACL,OAAO,EAAE,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;oBACpD,gBAAgB,EAAE,CAAC,gBAAgB,IAAI,CAAC,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,CAAC;iBAClE,CAAC;YACJ,CAAC,EACD;gBACE,OAAO,EAAE,EAAE;gBACX,gBAAgB,EAAE,CAAC;aACpB,CACF,CAAC;YAEF,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC;YAEpE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,IAAA,kBAAS,EAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAE1E,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE;gBAC/C,UAAU;gBACV,MAAM;aACP,CAAC,CAAC;YAEH,OAAO;gBACL,UAAU;gBACV,MAAM;gBACN,WAAW;aACZ,CAAC;QACJ,CAAC;KAAA;CACF;AApFD,wDAoFC"}

package/dist/basicEventbridgeClient.test.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/dist/basicEventbridgeClient.test.js ADDED Viewed

@@ -0,0 +1,74 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const logger_1 = require("@alanszp/logger");
+const shared_context_1 = require("@alanszp/shared-context");
+const awsEventbridgeClient_1 = require("./aws/awsEventbridgeClient");
+const mockEventbridgeClient_1 = require("./mockEventbridgeClient");
+const eventbridgeFixture_1 = require("./mocks/fixtures/eventbridgeFixture");
+const { eventsToSend, allSuccessfulResponses, allUnsuccessfulResponses, sevenUnsuccessfulResponses, } = eventbridgeFixture_1.fifteenEventsFixture;
+jest.mock("./aws/awsEventbridgeClient");
+const client = new mockEventbridgeClient_1.MockEventbridgeClient("appName", "env", () => (0, logger_1.createMockLogger)({}), new shared_context_1.SharedContext(), "busName");
+describe("BasicEventbridgeClient", () => {
+    describe("sendEvents", () => {
+        describe("when there are more than 10 events", () => {
+            describe("when they're all successful", () => {
+                it("should send two requests, aggregate results, and show no failures", () => __awaiter(void 0, void 0, void 0, function* () {
+                    awsEventbridgeClient_1.eventbridgeClient.putEvents
+                        .mockImplementationOnce((_) => ({
+                        promise: () => Promise.resolve(allSuccessfulResponses.firstResponse),
+                    }))
+                        .mockImplementationOnce((_) => ({
+                        promise: () => Promise.resolve(allSuccessfulResponses.secondResponse),
+                    }));
+                    const response = yield client.mockSendEvents(eventsToSend);
+                    expect(awsEventbridgeClient_1.eventbridgeClient.putEvents).toHaveBeenCalledTimes(2);
+                    expect(response.failedCount).toBe(0);
+                    expect(response.successful.length).toBe(15);
+                    expect(response.failed.length).toBe(0);
+                }));
+            });
+            describe("when they're all successful", () => {
+                it("should send two requests, aggregate results, and show fifteen failures", () => __awaiter(void 0, void 0, void 0, function* () {
+                    awsEventbridgeClient_1.eventbridgeClient.putEvents
+                        .mockImplementationOnce((_) => ({
+                        promise: () => Promise.resolve(allUnsuccessfulResponses.firstResponse),
+                    }))
+                        .mockImplementationOnce((_) => ({
+                        promise: () => Promise.resolve(allUnsuccessfulResponses.secondResponse),
+                    }));
+                    const response = yield client.mockSendEvents(eventsToSend);
+                    expect(awsEventbridgeClient_1.eventbridgeClient.putEvents).toHaveBeenCalledTimes(2);
+                    expect(response.failedCount).toBe(15);
+                    expect(response.successful.length).toBe(0);
+                    expect(response.failed.length).toBe(15);
+                }));
+            });
+            describe("when eight are successful", () => {
+                it("should send two requests, aggregate results, and show seven failures", () => __awaiter(void 0, void 0, void 0, function* () {
+                    awsEventbridgeClient_1.eventbridgeClient.putEvents
+                        .mockImplementationOnce((_) => ({
+                        promise: () => Promise.resolve(sevenUnsuccessfulResponses.firstResponse),
+                    }))
+                        .mockImplementationOnce((_) => ({
+                        promise: () => Promise.resolve(sevenUnsuccessfulResponses.secondResponse),
+                    }));
+                    const response = yield client.mockSendEvents(eventsToSend);
+                    expect(awsEventbridgeClient_1.eventbridgeClient.putEvents).toHaveBeenCalledTimes(2);
+                    expect(response.failedCount).toBe(7);
+                    expect(response.successful.length).toBe(8);
+                    expect(response.failed.length).toBe(7);
+                }));
+            });
+        });
+    });
+});
+//# sourceMappingURL=basicEventbridgeClient.test.js.map

package/dist/basicEventbridgeClient.test.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"basicEventbridgeClient.test.js","sourceRoot":"","sources":["../src/basicEventbridgeClient.test.ts"],"names":[],"mappings":"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"}

package/dist/mockEventbridgeClient.d.ts ADDED Viewed

@@ -0,0 +1,4 @@
+import { BasicEventbridgeClient, EventDispatchResult, LaraEvent } from "./basicEventbridgeClient";
+export declare class MockEventbridgeClient extends BasicEventbridgeClient {
+    mockSendEvents(events: LaraEvent[]): Promise<EventDispatchResult>;
+}

package/dist/mockEventbridgeClient.js ADDED Viewed

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MockEventbridgeClient = void 0;
+const basicEventbridgeClient_1 = require("./basicEventbridgeClient");
+class MockEventbridgeClient extends basicEventbridgeClient_1.BasicEventbridgeClient {
+    mockSendEvents(events) {
+        return this.sendEvents(events);
+    }
+}
+exports.MockEventbridgeClient = MockEventbridgeClient;
+//# sourceMappingURL=mockEventbridgeClient.js.map

package/dist/mockEventbridgeClient.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"mockEventbridgeClient.js","sourceRoot":"","sources":["../src/mockEventbridgeClient.ts"],"names":[],"mappings":";;;AAAA,qEAIkC;AAElC,MAAa,qBAAsB,SAAQ,+CAAsB;IACxD,cAAc,CAAC,MAAmB;QACvC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;CACF;AAJD,sDAIC"}

package/dist/mocks/fixtures/eventbridgeFixture.d.ts ADDED Viewed

@@ -0,0 +1,54 @@
+export declare const fifteenEventsFixture: {
+    eventsToSend: {
+        topic: string;
+        body: {
+            property: boolean;
+        };
+    }[];
+    allSuccessfulResponses: {
+        firstResponse: {
+            Entries: {
+                EventId: number;
+            }[];
+            FailedEntryCount: number;
+        };
+        secondResponse: {
+            Entries: {
+                EventId: number;
+            }[];
+            FailedEntryCount: number;
+        };
+    };
+    allUnsuccessfulResponses: {
+        firstResponse: {
+            Entries: {
+                EventId: null;
+            }[];
+            FailedEntryCount: number;
+        };
+        secondResponse: {
+            Entries: {
+                EventId: null;
+            }[];
+            FailedEntryCount: number;
+        };
+    };
+    sevenUnsuccessfulResponses: {
+        firstResponse: {
+            Entries: ({
+                EventId: number;
+            } | {
+                EventId: null;
+            })[];
+            FailedEntryCount: number;
+        };
+        secondResponse: {
+            Entries: ({
+                EventId: number;
+            } | {
+                EventId: null;
+            })[];
+            FailedEntryCount: number;
+        };
+    };
+};

package/dist/mocks/fixtures/eventbridgeFixture.js ADDED Viewed

@@ -0,0 +1,104 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fifteenEventsFixture = void 0;
+exports.fifteenEventsFixture = {
+    eventsToSend: [
+        { topic: "topic", body: { property: true } },
+        { topic: "topic", body: { property: true } },
+        { topic: "topic", body: { property: true } },
+        { topic: "topic", body: { property: true } },
+        { topic: "topic", body: { property: true } },
+        { topic: "topic", body: { property: true } },
+        { topic: "topic", body: { property: true } },
+        { topic: "topic", body: { property: true } },
+        { topic: "topic", body: { property: true } },
+        { topic: "topic", body: { property: true } },
+        { topic: "topic", body: { property: true } },
+        { topic: "topic", body: { property: true } },
+        { topic: "topic", body: { property: true } },
+        { topic: "topic", body: { property: true } },
+        { topic: "topic", body: { property: true } },
+    ],
+    allSuccessfulResponses: {
+        firstResponse: {
+            Entries: [
+                { EventId: 1 },
+                { EventId: 2 },
+                { EventId: 3 },
+                { EventId: 4 },
+                { EventId: 5 },
+                { EventId: 6 },
+                { EventId: 7 },
+                { EventId: 8 },
+                { EventId: 9 },
+                { EventId: 10 },
+            ],
+            FailedEntryCount: 0,
+        },
+        secondResponse: {
+            Entries: [
+                { EventId: 11 },
+                { EventId: 12 },
+                { EventId: 13 },
+                { EventId: 14 },
+                { EventId: 15 },
+            ],
+            FailedEntryCount: 0,
+        },
+    },
+    allUnsuccessfulResponses: {
+        firstResponse: {
+            Entries: [
+                { EventId: null },
+                { EventId: null },
+                { EventId: null },
+                { EventId: null },
+                { EventId: null },
+                { EventId: null },
+                { EventId: null },
+                { EventId: null },
+                { EventId: null },
+                { EventId: null },
+            ],
+            FailedEntryCount: 10,
+        },
+        secondResponse: {
+            Entries: [
+                { EventId: null },
+                { EventId: null },
+                { EventId: null },
+                { EventId: null },
+                { EventId: null },
+            ],
+            FailedEntryCount: 5,
+        },
+    },
+    sevenUnsuccessfulResponses: {
+        firstResponse: {
+            Entries: [
+                { EventId: 1 },
+                { EventId: 2 },
+                { EventId: 3 },
+                { EventId: 4 },
+                { EventId: null },
+                { EventId: null },
+                { EventId: null },
+                { EventId: null },
+                { EventId: null },
+                { EventId: null },
+            ],
+            FailedEntryCount: 6,
+        },
+        secondResponse: {
+            Entries: [
+                { EventId: 5 },
+                { EventId: 6 },
+                { EventId: 8 },
+                { EventId: null },
+                { EventId: 7 },
+            ],
+            FailedEntryCount: 1,
+        },
+    },
+};
+//# sourceMappingURL=eventbridgeFixture.js.map

package/dist/mocks/fixtures/eventbridgeFixture.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"eventbridgeFixture.js","sourceRoot":"","sources":["../../../src/mocks/fixtures/eventbridgeFixture.ts"],"names":[],"mappings":"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"}

package/jest.config.js ADDED Viewed

@@ -0,0 +1,10 @@
+module.exports = {
+  collectCoverageFrom: ["src/**/*.{js,jsx,ts,tsx}"],
+  roots: ["<rootDir>/src/"],
+  clearMocks: true,
+  resetMocks: true,
+  testEnvironment: "node",
+  moduleNameMapper: {
+    "@/(.*)": "<rootDir>/src/$1",
+  },
+};

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@alanszp/eventbridge-client",
-  "version": "7.4.1",
+  "version": "7.4.3",
   "description": "Alan's basic eventbridge client.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -15,11 +15,16 @@
     "compile": "rm -rf ./dist && tsc --declaration",
     "compile-watch": "tsc -w",
     "build": "yarn run compile",
+    "test": "TZ=Etc/UTC jest",
     "prepack": "yarn run build",
     "yalc-publish": "yarn run yalc publish"
   },
   "devDependencies": {
+    "@types/jest": "^28.1.8",
     "@types/node": "^15.12.3",
+    "babel-jest": "^29.0.0",
+    "eslint-plugin-jest": "^26.8.7",
+    "jest": "^29.0.0",
     "ts-node": "^10.0.0",
     "typescript": "^4.3.4"
   },
@@ -30,5 +35,5 @@
     "cuid": "^2.1.8",
     "lodash": "^4.17.21"
   },
-  "gitHead": "84e3f67bf87c2e574df3899a8f9a95303739d423"
+  "gitHead": "3d54c1c62cb0c48b79abf79498e00eafe7843269"
 }

package/src/basicEventbridgeClient.test.ts ADDED Viewed

@@ -0,0 +1,89 @@
+import { createMockLogger } from "@alanszp/logger";
+import { SharedContext } from "@alanszp/shared-context";
+import { eventbridgeClient } from "./aws/awsEventbridgeClient";
+import { MockEventbridgeClient } from "./mockEventbridgeClient";
+import { fifteenEventsFixture } from "./mocks/fixtures/eventbridgeFixture";
+const {
+  eventsToSend,
+  allSuccessfulResponses,
+  allUnsuccessfulResponses,
+  sevenUnsuccessfulResponses,
+} = fifteenEventsFixture;
+jest.mock("./aws/awsEventbridgeClient");
+const client = new MockEventbridgeClient(
+  "appName",
+  "env",
+  () => createMockLogger({}),
+  new SharedContext(),
+  "busName"
+);
+describe("BasicEventbridgeClient", () => {
+  describe("sendEvents", () => {
+    describe("when there are more than 10 events", () => {
+      describe("when they're all successful", () => {
+        it("should send two requests, aggregate results, and show no failures", async () => {
+          (eventbridgeClient.putEvents as jest.Mock)
+            .mockImplementationOnce((_) => ({
+              promise: () =>
+                Promise.resolve(allSuccessfulResponses.firstResponse),
+            }))
+            .mockImplementationOnce((_) => ({
+              promise: () =>
+                Promise.resolve(allSuccessfulResponses.secondResponse),
+            }));
+          const response = await client.mockSendEvents(eventsToSend);
+          expect(eventbridgeClient.putEvents).toHaveBeenCalledTimes(2);
+          expect(response.failedCount).toBe(0);
+          expect(response.successful.length).toBe(15);
+          expect(response.failed.length).toBe(0);
+        });
+      });
+      describe("when they're all successful", () => {
+        it("should send two requests, aggregate results, and show fifteen failures", async () => {
+          (eventbridgeClient.putEvents as jest.Mock)
+            .mockImplementationOnce((_) => ({
+              promise: () =>
+                Promise.resolve(allUnsuccessfulResponses.firstResponse),
+            }))
+            .mockImplementationOnce((_) => ({
+              promise: () =>
+                Promise.resolve(allUnsuccessfulResponses.secondResponse),
+            }));
+          const response = await client.mockSendEvents(eventsToSend);
+          expect(eventbridgeClient.putEvents).toHaveBeenCalledTimes(2);
+          expect(response.failedCount).toBe(15);
+          expect(response.successful.length).toBe(0);
+          expect(response.failed.length).toBe(15);
+        });
+      });
+      describe("when eight are successful", () => {
+        it("should send two requests, aggregate results, and show seven failures", async () => {
+          (eventbridgeClient.putEvents as jest.Mock)
+            .mockImplementationOnce((_) => ({
+              promise: () =>
+                Promise.resolve(sevenUnsuccessfulResponses.firstResponse),
+            }))
+            .mockImplementationOnce((_) => ({
+              promise: () =>
+                Promise.resolve(sevenUnsuccessfulResponses.secondResponse),
+            }));
+          const response = await client.mockSendEvents(eventsToSend);
+          expect(eventbridgeClient.putEvents).toHaveBeenCalledTimes(2);
+          expect(response.failedCount).toBe(7);
+          expect(response.successful.length).toBe(8);
+          expect(response.failed.length).toBe(7);
+        });
+      });
+    });
+  });
+});

package/src/basicEventbridgeClient.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { ILogger } from "@alanszp/logger";
 import { SharedContext } from "@alanszp/shared-context";
-import { compact, partition } from "lodash";
+import { chain, chunk, compact, partition } from "lodash";
 import { eventbridgeClient, EventRequest, PutEventEntryResponse } from "./aws";
 import { mapLaraEventToAWSEvent } from "./helpers/mapLaraEventToAWSEvent";
@@ -22,6 +22,11 @@ export interface EventDispatchResult {
   failedCount: number | undefined;
 }
+/**
+ * Max batch size for the putEvents request defined by AWS.
+ */
+const MAX_BATCH_SIZE = 10;
 /**
  * Basic client for Eventbridge.
  * Usage will be done by extending this class and implementing methods that internally call the protected sendEvents method.
@@ -53,23 +58,50 @@ export class BasicEventbridgeClient {
   ): Promise<EventDispatchResult> {
     const logger = this.getLogger();
-    const eventsToSend: EventRequest = {
-      Entries: compact(
-        events.map((event) =>
-          mapLaraEventToAWSEvent(
-            event,
-            this.env,
-            this.appName,
-            this.bus,
-            logger,
-            this.context
-          )
+    const eventsToSend = chain(events)
+      .map((event) =>
+        mapLaraEventToAWSEvent(
+          event,
+          this.env,
+          this.appName,
+          this.bus,
+          logger,
+          this.context
         )
-      ),
-    };
+      )
+      .compact()
+      .chunk(MAX_BATCH_SIZE)
+      .map((mappedEventsChunk) => ({
+        Entries: mappedEventsChunk,
+      }))
+      .value();
+    const results = await Promise.all(
+      eventsToSend.map((events) =>
+        eventbridgeClient
+          .putEvents(events)
+          .promise()
+      )
+    );
+    const aggregatedResult = results.reduce(
+      (prev, act) => {
+        const { Entries: NewEntries, FailedEntryCount: newFailedCount } = act;
+        const { Entries, FailedEntryCount } = prev;
+        return {
+          Entries: [...(Entries || []), ...(NewEntries || [])],
+          FailedEntryCount: (FailedEntryCount || 0) + (newFailedCount || 0),
+        };
+      },
+      {
+        Entries: [],
+        FailedEntryCount: 0,
+      }
+    );
+    const { Entries, FailedEntryCount: failedCount } = aggregatedResult;
-    const result = await eventbridgeClient.putEvents(eventsToSend).promise();
-    const { Entries, FailedEntryCount: failedCount } = result;
     const [successful, failed] = partition(Entries, (entry) => entry.EventId);
     logger.info("eventbridge.client.sendEvents.end", {

package/src/mockEventbridgeClient.ts ADDED Viewed

@@ -0,0 +1,11 @@
+import {
+  BasicEventbridgeClient,
+  EventDispatchResult,
+  LaraEvent,
+} from "./basicEventbridgeClient";
+export class MockEventbridgeClient extends BasicEventbridgeClient {
+  public mockSendEvents(events: LaraEvent[]): Promise<EventDispatchResult> {
+    return this.sendEvents(events);
+  }
+}

package/src/mocks/fixtures/eventbridgeFixture.ts ADDED Viewed

@@ -0,0 +1,105 @@
+export const fifteenEventsFixture = {
+  eventsToSend: [
+    { topic: "topic", body: { property: true } },
+    { topic: "topic", body: { property: true } },
+    { topic: "topic", body: { property: true } },
+    { topic: "topic", body: { property: true } },
+    { topic: "topic", body: { property: true } },
+    { topic: "topic", body: { property: true } },
+    { topic: "topic", body: { property: true } },
+    { topic: "topic", body: { property: true } },
+    { topic: "topic", body: { property: true } },
+    { topic: "topic", body: { property: true } },
+    { topic: "topic", body: { property: true } },
+    { topic: "topic", body: { property: true } },
+    { topic: "topic", body: { property: true } },
+    { topic: "topic", body: { property: true } },
+    { topic: "topic", body: { property: true } },
+  ],
+  allSuccessfulResponses: {
+    firstResponse: {
+      Entries: [
+        { EventId: 1 },
+        { EventId: 2 },
+        { EventId: 3 },
+        { EventId: 4 },
+        { EventId: 5 },
+        { EventId: 6 },
+        { EventId: 7 },
+        { EventId: 8 },
+        { EventId: 9 },
+        { EventId: 10 },
+      ],
+      FailedEntryCount: 0,
+    },
+    secondResponse: {
+      Entries: [
+        { EventId: 11 },
+        { EventId: 12 },
+        { EventId: 13 },
+        { EventId: 14 },
+        { EventId: 15 },
+      ],
+      FailedEntryCount: 0,
+    },
+  },
+  allUnsuccessfulResponses: {
+    firstResponse: {
+      Entries: [
+        { EventId: null },
+        { EventId: null },
+        { EventId: null },
+        { EventId: null },
+        { EventId: null },
+        { EventId: null },
+        { EventId: null },
+        { EventId: null },
+        { EventId: null },
+        { EventId: null },
+      ],
+      FailedEntryCount: 10,
+    },
+    secondResponse: {
+      Entries: [
+        { EventId: null },
+        { EventId: null },
+        { EventId: null },
+        { EventId: null },
+        { EventId: null },
+      ],
+      FailedEntryCount: 5,
+    },
+  },
+  sevenUnsuccessfulResponses: {
+    firstResponse: {
+      Entries: [
+        { EventId: 1 },
+        { EventId: 2 },
+        { EventId: 3 },
+        { EventId: 4 },
+        { EventId: null },
+        { EventId: null },
+        { EventId: null },
+        { EventId: null },
+        { EventId: null },
+        { EventId: null },
+      ],
+      FailedEntryCount: 6,
+    },
+    secondResponse: {
+      Entries: [
+        { EventId: 5 },
+        { EventId: 6 },
+        { EventId: 8 },
+        { EventId: null },
+        { EventId: 7 },
+      ],
+      FailedEntryCount: 1,
+    },
+  },
+};

package/tsconfig.json CHANGED Viewed

@@ -4,12 +4,15 @@
     "outDir": "dist",
     "module": "commonjs",
     "target": "es6",
-    "types": ["node"],
+    "types": ["jest", "node"],
     "esModuleInterop": true,
     "sourceMap": true,
     "alwaysStrict": true,
     "strictNullChecks": true
   },
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules"],
+  "paths": {
+    "@/*": ["src/*"]
+  }
 }