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

package/dist/src/config.d.ts

@@ -6,9 +6,6 @@ export type Config = {
     boundServicesPort?: number;
     localStackDockerImage?: string;
     localStateBindMount?: string;
-    queueName?: string;
-    topicName?: string;
-    tableName?: string;
 };
 export type AwsConfig = {
     region: string;
@@ -24,10 +21,4 @@ export type DevServerConfig = {
     sqs: Sqs;
     sns: Sns;
     dynamo: DynamoDb;
-    table: string;
-    topic: {
-        arn: string;
-        name: string;
-    };
-    queue: string;
 };

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

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

package/dist/src/dev-server.js

@@ -10,7 +10,6 @@ var sns_1 = require("./sns");
 var DevServer = /** @class */ (function () {
     function DevServer(name, service, config) {
         var _this = this;
-        var _a, _b, _c;
         this.name = name;
         this.service = service;
         this.config = config;
@@ -30,12 +29,6 @@ var DevServer = /** @class */ (function () {
                 sqs: new sqs_1.Sqs(infra.aws),
                 sns: new sns_1.Sns(infra.aws),
                 dynamo: new dynamodb_1.DynamoDb(infra.aws),
-                table: _this.tableName,
-                topic: {
-                    arn: "arn:aws:sns:us-east-1:000000000000:".concat(_this.topicName),
-                    name: _this.topicName,
-                },
-                queue: _this.queueName,
             }); })
                 .then(function (config) { _this.LOGGER.debug('starting. config is %o', config); return config; })
                 .then(function (aws) { return _this.service.start(aws); })
@@ -46,10 +39,6 @@ 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, 16);
-        this.topicName = (_a = config === null || config === void 0 ? void 0 : config.topicName) !== null && _a !== void 0 ? _a : "Topic".concat(encodedName);
-        this.queueName = (_b = config === null || config === void 0 ? void 0 : config.queueName) !== null && _b !== void 0 ? _b : "Queue".concat(encodedName);
-        this.tableName = (_c = config === null || config === void 0 ? void 0 : config.tableName) !== null && _c !== void 0 ? _c : "Table".concat(encodedName);
     }
     return DevServer;
 }());

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

@@ -1,26 +1,17 @@
 import { SQSEvent } from 'aws-lambda';
-import { Lifecycle, Service, Callback } from './services';
-import { DevServerConfig } from './config';
+import { Service, Callback } from './services';
 export declare const newEventsProxy: (name: string, config: {
     handlers: EventHandler[];
-}, 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 stopped;
-    constructor(name: string, handlers: EventHandler[]);
-    start: (config: DevServerConfig) => Promise<this>;
-    private queueConnectedToTopic;
-    private startEventsConsumer;
-    private extractErrorMessage;
-    private onEachMessage;
-    stop: () => Promise<void>;
-}
+    topic?: string;
+    queue?: string;
+}, callback?: Callback<{
+    arn: string;
+    name: string;
+}>) => Service<{
+    arn: string;
+    name: string;
+}>;
 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) {
+    function EventsProxy(name, handlers, topic, queue) {
         var _this = this;
         this.name = name;
         this.handlers = handlers;
@@ -55,11 +55,14 @@ 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, config.topic.name, config.sqs, config.queue)
-                        .then(function (url) { return _this.startEventsConsumer(config.sqs.client, url); })
-                        .then(function (url) { return _this.LOGGER.debug('initialized: %s', url); })
-                        .then(function () { return _this.stopped = false; })
-                        .then(function () { return _this; })];
+                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; });
+                    })];
             });
         }); };
         this.queueConnectedToTopic = function (sns, topic, sqs, queue) { return __awaiter(_this, void 0, void 0, function () {
@@ -68,8 +71,8 @@ var EventsProxy = /** @class */ (function () {
                         sns.createTopic(topic), sqs.createNamedQueue(queue)
                     ])
                         .then(function (values) { return sns
-                        .createSubscription({ arn: values[0] }, { arn: values[1].arn })
-                        .then(function () { return values[1].url; }); })];
+                        .createSubscription(values[0], values[1])
+                        .then(function () { return values; }); })];
             });
         }); };
         this.startEventsConsumer = function (sqs, url) { return __awaiter(_this, void 0, void 0, function () {
@@ -124,6 +127,10 @@ 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);
     }
     return EventsProxy;
 }());

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

@@ -5,17 +5,23 @@ 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 server;
+    private readonly server;
     private config;
-    constructor(name: string, settings: HttpSettings, method: string, subject?: string);
+    constructor(name: string, settings: HttpSettings, method: string, topic: {
+        arn: 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,20 +17,21 @@ 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.topic, config.subject), callback); };
 exports.newSnsHttpProxy = newSnsHttpProxy;
 var SnsHttpProxy = /** @class */ (function () {
-    function SnsHttpProxy(name, settings, method, subject) {
+    function SnsHttpProxy(name, settings, method, topic, 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: config.topic.arn,
+                topic: _this.topic.arn,
                 sns: config.sns
             };
             return endpoint;

package/dist/src/sns.d.ts

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

package/dist/src/sns.js

@@ -50,7 +50,11 @@ 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 (o) { return (0, assert_1.assertNotUndefined)(o.TopicArn, 'TopicArn is not present'); })
+                        .then(function (arn) { return ({
+                        arn: arn,
+                        name: topic,
+                    }); })];
             });
         }); };
         this.createSubscription = function (topic, queue) { return __awaiter(_this, void 0, void 0, function () {

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@yopdev/dev-server",
-  "version": "1.2.4",
+  "version": "1.3.0-alpha.2",
   "scripts": {
     "compile": "tsc",
+    "pretest": "npm run compile",
     "test": "jest",
     "clean": "rm -rf dist",
     "predistclean": "npm run clean",