@yopdev/dev-server 1.4.0-alpha.1 → 1.4.1-alpha.0

package/dist/src/event-proxy.d.ts

@@ -1,10 +1,12 @@
 import { SQSEvent } from 'aws-lambda';
+import { MessageAttributeValue } from '@aws-sdk/client-sqs';
 import { Service } from './services';
 export declare const newEventsProxy: (name: string, config: {
     handlers: EventHandler[];
     topic?: string;
 }) => Service<any>;
 export type EventHandler = {
+    name: string;
     handler: (event: SQSEvent) => Promise<unknown>;
-    matcher: (subject: string) => boolean;
+    matcher: (subject: string, attributes: Record<string, MessageAttributeValue>) => boolean;
 };

package/dist/src/event-proxy.js

@@ -89,29 +89,29 @@ var EventsProxy = /** @class */ (function () {
         }); };
         this.extractErrorMessage = function (e) { return typeof e === 'string' ? e : e.message !== undefined && typeof e.message === 'string' ? e.message : ''; };
         this.onEachMessage = function (message) {
-            var body = (0, assert_1.assertNotUndefined)(message.Body, 'body is not present');
-            var subject = JSON.parse(body).Subject;
             if (_this.stopped) {
-                _this.LOGGER.warn('stopped events proxy received message with subject %s', subject);
+                _this.LOGGER.warn('stopped events proxy received message %o', message);
                 return;
             }
-            var handlers = _this.handlers.filter(function (handler) { return handler.matcher(subject); });
+            var body = (0, assert_1.assertNotUndefined)(message.Body, 'body is not present');
+            var subject = JSON.parse(body).Subject;
+            var handlers = _this.handlers.filter(function (handler) { var _a; return handler.matcher(subject, (_a = message.MessageAttributes) !== null && _a !== void 0 ? _a : {}); });
             if (handlers.length === 0) {
-                _this.LOGGER.warn('no handlers found for subject %s, message %o', subject, message);
+                _this.LOGGER.warn('no handlers found for message %o', message);
             }
+            var record = (0, mappers_1.mapToLambdaSqsRecord)(message);
             handlers.forEach(function (handler) {
-                var record = (0, mappers_1.mapToLambdaSqsRecord)(message);
-                handler
+                return handler
                     .handler({ Records: [record] })
                     .then(function () {
                     var _a;
                     var json = JSON.parse(record.body);
                     var subject = json.Subject || ((_a = json.Message) === null || _a === void 0 ? void 0 : _a.eventname) || 'unknown';
-                    _this.LOGGER.debug('subject accepted %s', subject);
+                    _this.LOGGER.debug('handler %s accepted message', handler.name);
                 })
                     .catch(function (e) {
                     var error = _this.extractErrorMessage(e);
-                    _this.LOGGER.error(e, 'failed %s with %s', subject, error);
+                    _this.LOGGER.error(e, 'handler %s failed with %s', handler.name, error);
                 });
             });
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yopdev/dev-server",
-  "version": "1.4.0-alpha.1",
+  "version": "1.4.1-alpha.0",
   "scripts": {
     "compile": "tsc",
     "pretest": "npm run compile",