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

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

@@ -1,9 +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

@@ -43,20 +43,22 @@ var logging_1 = require("@yopdev/logging");
 var stoppable_1 = require("./stoppable");
 var assert_1 = require("./assert");
 var services_1 = require("./services");
-var newEventsProxy = function (name, config) { return new services_1.Service(new EventsProxy(name, config.handlers)); };
+var newEventsProxy = function (name, config) { return new services_1.Service(new EventsProxy(name, config.handlers, config.topic)); };
 exports.newEventsProxy = newEventsProxy;
 var EventsProxy = /** @class */ (function () {
-    function EventsProxy(name, handlers) {
+    function EventsProxy(name, handlers, topic) {
         var _this = this;
         this.name = name;
         this.handlers = handlers;
+        this.topic = topic;
         this.pollingFrequency = 1;
         this.stopped = true;
         this.queueName = function () { return "EventProxyQueue".concat(Buffer.from(_this.name).toString('hex').substring(0, 64)); };
         this.start = function (config) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.queueConnectedToTopic(config.sns, config.eventsProxy.topic.arn, config.sqs, this.queueName())
+            var _a;
+            return __generator(this, function (_b) {
+                return [2 /*return*/, this.queueConnectedToTopic(config.sns, (_a = this.topic) !== null && _a !== void 0 ? _a : config.eventsProxy.topic.arn, config.sqs, this.queueName())
                         .then(function (url) { return _this.startEventsConsumer(config.sqs.client, url); })
                         .then(function () { return _this.stopped = false; })
                         .then(function () { return undefined; })];
@@ -87,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/dist/src/sns-http-proxy.d.ts

@@ -5,17 +5,19 @@ import { DevServerConfig } from "./config";
 export declare const newSnsHttpProxy: (name: string, config: {
     settings: HttpSettings;
     method: string;
-    subject: string | undefined;
+    subject?: string;
+    topic?: string;
 }, callback?: Callback<string>) => Service<string>;
 export declare class SnsHttpProxy implements Lifecycle<string> {
     readonly name: string;
     private readonly settings;
     private readonly method;
     private readonly subject?;
+    private readonly topic?;
     private LOGGER;
     private server;
     private config;
-    constructor(name: string, settings: HttpSettings, method: string, subject?: string);
+    constructor(name: string, settings: HttpSettings, method: string, subject?: string, topic?: string);
     start: (config: DevServerConfig) => Promise<string>;
     stop: () => Promise<void>;
     handler: (method: string, subject?: string) => (request: IncomingMessage, body: string, response: ServerResponse) => Promise<void>;

package/dist/src/sns-http-proxy.js

@@ -17,20 +17,22 @@ var http_server_1 = require("./http-server");
 var responses_1 = require("./responses");
 var services_1 = require("./services");
 var assert_1 = require("./assert");
-var newSnsHttpProxy = function (name, config, callback) { return new services_1.Service(new SnsHttpProxy(name, config.settings, config.method, config.subject), callback); };
+var newSnsHttpProxy = function (name, config, callback) { return new services_1.Service(new SnsHttpProxy(name, config.settings, config.method, config.subject, config.topic), callback); };
 exports.newSnsHttpProxy = newSnsHttpProxy;
 var SnsHttpProxy = /** @class */ (function () {
-    function SnsHttpProxy(name, settings, method, subject) {
+    function SnsHttpProxy(name, settings, method, subject, topic) {
         var _this = this;
         this.name = name;
         this.settings = settings;
         this.method = method;
         this.subject = subject;
+        this.topic = topic;
         this.start = function (config) { return Promise.resolve(_this.server)
             .then(function (server) { return server.start(); })
             .then(function (endpoint) {
+            var _a;
             _this.config = {
-                topic: config.eventsProxy.topic,
+                topic: (_a = _this.topic) !== null && _a !== void 0 ? _a : config.eventsProxy.topic.arn,
                 sns: config.sns
             };
             return endpoint;
@@ -43,7 +45,7 @@ var SnsHttpProxy = /** @class */ (function () {
                 return Promise.resolve(((0, assert_1.assertNotUndefined)(_this.config)))
                     .then(function (config) {
                     return config.sns
-                        .publish(config.topic, _this.extractMessage(method, request, body), subject, _this.extractMessageAttributes(request))
+                        .publish({ arn: config.topic }, _this.extractMessage(method, request, body), subject, _this.extractMessageAttributes(request))
                         .then(function () { return (0, responses_1.writeResponse)(response, 200, ''); })
                         .catch(function (e) {
                         _this.LOGGER.error(e, 'request failed to execute');

package/package.json

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