@yopdev/dev-server 1.3.0-alpha.2 → 1.3.0-alpha.4

package/dist/src/config.d.ts

@@ -21,4 +21,9 @@ export type DevServerConfig = {
     sqs: Sqs;
     sns: Sns;
     dynamo: DynamoDb;
+    eventsProxy: {
+        topic: {
+            arn: string;
+        };
+    };
 };

package/dist/src/dev-server.d.ts

@@ -4,6 +4,7 @@ export declare class DevServer implements Lifecycle<DevServer> {
     readonly name: string;
     private readonly service;
     private readonly config?;
+    private readonly eventProxyTopic;
     private LOGGER;
     private localStack;
     constructor(name: string, service: Service<any>, config?: Config);

package/dist/src/dev-server.js

@@ -23,13 +23,22 @@ var DevServer = /** @class */ (function () {
                 aws: config,
                 network: infra.network
             }); }); })
-                .then(function (infra) { return ({
+                .then(function (infra) { return Promise
+                .resolve(new sns_1.Sns(infra.aws))
+                .then(function (sns) { return sns
+                .createTopic(_this.eventProxyTopic)
+                .then(function (eventProxyTopicArn) { return ({
                 raw: infra.aws,
                 network: infra.network,
                 sqs: new sqs_1.Sqs(infra.aws),
                 sns: new sns_1.Sns(infra.aws),
                 dynamo: new dynamodb_1.DynamoDb(infra.aws),
-            }); })
+                eventsProxy: {
+                    topic: {
+                        arn: eventProxyTopicArn
+                    }
+                },
+            }); }); }); })
                 .then(function (config) { _this.LOGGER.debug('starting. config is %o', config); return config; })
                 .then(function (aws) { return _this.service.start(aws); })
                 .then(function () { return _this.LOGGER.info('started'); })
@@ -39,6 +48,8 @@ var DevServer = /** @class */ (function () {
             .then(function () { var _a; return (_a = _this.localStack) === null || _a === void 0 ? void 0 : _a.stop(); })
             .then(function () { return _this.LOGGER.info('stopped'); }); };
         this.LOGGER = logging_1.LoggerFactory.create("DEVSERVER[".concat(name, "]"));
+        var encodedName = Buffer.from(name).toString('hex').substring(0, 64);
+        this.eventProxyTopic = "EventProxyTopic".concat(encodedName);
     }
     return DevServer;
 }());

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

@@ -1,17 +1,27 @@
 import { SQSEvent } from 'aws-lambda';
-import { Service, Callback } from './services';
+import { Lifecycle, Service, Callback } from './services';
+import { DevServerConfig } from './config';
 export declare const newEventsProxy: (name: string, config: {
     handlers: EventHandler[];
-    topic?: string;
-    queue?: string;
-}, callback?: Callback<{
-    arn: string;
-    name: string;
-}>) => Service<{
-    arn: string;
-    name: string;
-}>;
+}, callback?: Callback<EventsProxy>) => Service<EventsProxy>;
+declare class EventsProxy implements Lifecycle<EventsProxy> {
+    readonly name: string;
+    private readonly handlers;
+    private LOGGER;
+    private consumer;
+    private readonly pollingFrequency;
+    private readonly queue;
+    private stopped;
+    constructor(name: string, handlers: EventHandler[]);
+    start: (config: DevServerConfig) => Promise<this>;
+    private queueConnectedToTopic;
+    private startEventsConsumer;
+    private extractErrorMessage;
+    private onEachMessage;
+    stop: () => Promise<void>;
+}
 export type EventHandler = {
     handler: (event: SQSEvent) => Promise<unknown>;
     matcher: (subject: string) => boolean;
 };
+export {};

package/dist/src/event-proxy.js

@@ -46,7 +46,7 @@ var services_1 = require("./services");
 var newEventsProxy = function (name, config, callback) { return new services_1.Service(new EventsProxy(name, config.handlers), callback); };
 exports.newEventsProxy = newEventsProxy;
 var EventsProxy = /** @class */ (function () {
-    function EventsProxy(name, handlers, topic, queue) {
+    function EventsProxy(name, handlers) {
         var _this = this;
         this.name = name;
         this.handlers = handlers;
@@ -55,24 +55,18 @@ var EventsProxy = /** @class */ (function () {
         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, this.topic, config.sqs, this.queue)
-                        .then(function (_a) {
-                        var topic = _a[0], queue = _a[1];
-                        return _this.startEventsConsumer(config.sqs.client, queue.url)
-                            .then(function () { return _this.LOGGER.info('started'); })
-                            .then(function () { return _this.stopped = false; })
-                            .then(function () { return topic; });
-                    })];
+                return [2 /*return*/, this.queueConnectedToTopic(config.sns, config.eventsProxy.topic.arn, config.sqs, this.queue)
+                        .then(function (url) { return _this.startEventsConsumer(config.sqs.client, url); })
+                        .then(function () { return _this.stopped = false; })
+                        .then(function () { return _this; })];
             });
         }); };
         this.queueConnectedToTopic = function (sns, topic, sqs, queue) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, Promise.all([
-                        sns.createTopic(topic), sqs.createNamedQueue(queue)
-                    ])
-                        .then(function (values) { return sns
-                        .createSubscription(values[0], values[1])
-                        .then(function () { return values; }); })];
+                return [2 /*return*/, sqs.createNamedQueue(queue)
+                        .then(function (queue) { return sns
+                        .createSubscription({ arn: topic }, { arn: queue.arn })
+                        .then(function () { return queue.url; }); })];
             });
         }); };
         this.startEventsConsumer = function (sqs, url) { return __awaiter(_this, void 0, void 0, function () {
@@ -128,9 +122,7 @@ var EventsProxy = /** @class */ (function () {
         }); };
         this.LOGGER = logging_1.LoggerFactory.create("SNS->SQS[".concat(name, "]"));
         var encodedName = Buffer.from(name).toString('hex').substring(0, 64);
-        this.topic = topic !== null && topic !== void 0 ? topic : "EventProxyTopic".concat(encodedName);
-        this.queue = queue !== null && queue !== void 0 ? queue : "EventProxyQueue".concat(encodedName);
-        this.LOGGER.info('proxying events from %s to %s', this.topic, this.queue);
+        this.queue = "EventProxyQueue".concat(encodedName);
     }
     return EventsProxy;
 }());

package/dist/src/sns-http-proxy.d.ts

@@ -5,23 +5,17 @@ import { DevServerConfig } from "./config";
 export declare const newSnsHttpProxy: (name: string, config: {
     settings: HttpSettings;
     method: string;
-    topic: {
-        arn: string;
-    };
     subject: string | undefined;
 }, callback?: Callback<string>) => Service<string>;
 export declare class SnsHttpProxy implements Lifecycle<string> {
     readonly name: string;
     private readonly settings;
     private readonly method;
-    private readonly topic;
     private readonly subject?;
     private LOGGER;
-    private readonly server;
+    private server;
     private config;
-    constructor(name: string, settings: HttpSettings, method: string, topic: {
-        arn: string;
-    }, subject?: string);
+    constructor(name: string, settings: HttpSettings, method: string, subject?: 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,21 +17,20 @@ 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.topic, config.subject), callback); };
+var newSnsHttpProxy = function (name, config, callback) { return new services_1.Service(new SnsHttpProxy(name, config.settings, config.method, config.subject), callback); };
 exports.newSnsHttpProxy = newSnsHttpProxy;
 var SnsHttpProxy = /** @class */ (function () {
-    function SnsHttpProxy(name, settings, method, topic, subject) {
+    function SnsHttpProxy(name, settings, method, subject) {
         var _this = this;
         this.name = name;
         this.settings = settings;
         this.method = method;
-        this.topic = topic;
         this.subject = subject;
         this.start = function (config) { return Promise.resolve(_this.server)
             .then(function (server) { return server.start(); })
             .then(function (endpoint) {
             _this.config = {
-                topic: _this.topic.arn,
+                topic: config.eventsProxy.topic,
                 sns: config.sns
             };
             return endpoint;
@@ -44,7 +43,7 @@ var SnsHttpProxy = /** @class */ (function () {
                 return Promise.resolve(((0, assert_1.assertNotUndefined)(_this.config)))
                     .then(function (config) {
                     return config.sns
-                        .publish({ arn: config.topic }, _this.extractMessage(method, request, body), subject, _this.extractMessageAttributes(request))
+                        .publish(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/dist/src/sns.d.ts

@@ -3,10 +3,7 @@ import { AwsConfig } from "./config";
 export declare class Sns {
     readonly client: SNSClient;
     constructor(aws: AwsConfig);
-    createTopic: (topic: string) => Promise<{
-        arn: string;
-        name: string;
-    }>;
+    createTopic: (topic: string) => Promise<string>;
     createSubscription: (topic: {
         arn: string;
     }, queue: {

package/dist/src/sns.js

@@ -50,11 +50,7 @@ var Sns = /** @class */ (function () {
                         .send(new client_sns_1.CreateTopicCommand({
                         Name: topic,
                     }))
-                        .then(function (o) { return (0, assert_1.assertNotUndefined)(o.TopicArn, 'TopicArn is not present'); })
-                        .then(function (arn) { return ({
-                        arn: arn,
-                        name: topic,
-                    }); })];
+                        .then(function (o) { return (0, assert_1.assertNotUndefined)(o.TopicArn, 'TopicArn is not present'); })];
             });
         }); };
         this.createSubscription = function (topic, queue) { return __awaiter(_this, void 0, void 0, function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yopdev/dev-server",
-  "version": "1.3.0-alpha.2",
+  "version": "1.3.0-alpha.4",
   "scripts": {
     "compile": "tsc",
     "pretest": "npm run compile",