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

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.
@@ -2,6 +2,7 @@ import { Sqs } from "./sqs";
2
2
  import { Sns } from "./sns";
3
3
  import { DynamoDb } from "./dynamodb";
4
4
  import { StartedNetwork } from "testcontainers";
5
+ import { S3 } from "./s3";
5
6
  export type Config = {
6
7
  boundServicesPort?: number;
7
8
  localStackDockerImage?: string;
@@ -20,6 +21,7 @@ export type DevServerConfig = {
20
21
  network: StartedNetwork;
21
22
  sqs: Sqs;
22
23
  sns: Sns;
24
+ s3: S3;
23
25
  dynamo: DynamoDb;
24
26
  eventsProxy: {
25
27
  topic: {
@@ -0,0 +1,18 @@
1
+ import { BindMount, Environment } from 'testcontainers/build/types';
2
+ import { Callback, Service } from './services';
3
+ import { PortWithOptionalBinding } from 'testcontainers/build/utils/port';
4
+ import { Readable } from 'stream';
5
+ import { WaitStrategy } from 'testcontainers/build/wait-strategies/wait-strategy';
6
+ export declare const newContainer: (name: string, config: {
7
+ image: string;
8
+ networkAlias: string;
9
+ environment?: Environment;
10
+ bindMounts?: BindMount[];
11
+ exposedPorts?: PortWithOptionalBinding[];
12
+ logConsumer?: (stream: Readable) => unknown;
13
+ startup?: {
14
+ waitStrategy: WaitStrategy;
15
+ timeout: number;
16
+ };
17
+ endpointBuilder?: (port: number) => string;
18
+ }, callback?: Callback<string>) => Service<string>;
@@ -0,0 +1,80 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ var __generator = (this && this.__generator) || function (thisArg, body) {
12
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
+ function verb(n) { return function (v) { return step([n, v]); }; }
15
+ function step(op) {
16
+ if (f) throw new TypeError("Generator is already executing.");
17
+ while (g && (g = 0, op[0] && (_ = 0)), _) try {
18
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
19
+ if (y = 0, t) op = [op[0] & 2, t.value];
20
+ switch (op[0]) {
21
+ case 0: case 1: t = op; break;
22
+ case 4: _.label++; return { value: op[1], done: false };
23
+ case 5: _.label++; y = op[1]; op = [0]; continue;
24
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
25
+ default:
26
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
27
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
28
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
29
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
30
+ if (t[2]) _.ops.pop();
31
+ _.trys.pop(); continue;
32
+ }
33
+ op = body.call(thisArg, _);
34
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
35
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
+ }
37
+ };
38
+ Object.defineProperty(exports, "__esModule", { value: true });
39
+ exports.newContainer = void 0;
40
+ var logging_1 = require("@yopdev/logging");
41
+ var testcontainers_1 = require("testcontainers");
42
+ var services_1 = require("./services");
43
+ var newContainer = function (name, config, callback) {
44
+ return new services_1.Service(new Container(name, config.image, config.networkAlias, config.environment, config.bindMounts, config.exposedPorts, config.logConsumer, config.startup, config.endpointBuilder), callback);
45
+ };
46
+ exports.newContainer = newContainer;
47
+ var Container = /** @class */ (function () {
48
+ function Container(name, image, networkAlias, environment, bindMounts, exposedPorts, logConsumer, startup, endpointBuilder) {
49
+ var _this = this;
50
+ this.name = name;
51
+ this.networkAlias = networkAlias;
52
+ this.start = function (config) { return __awaiter(_this, void 0, void 0, function () {
53
+ var _this = this;
54
+ return __generator(this, function (_a) {
55
+ return [2 /*return*/, Promise.resolve(this.LOGGER.info('start'))
56
+ .then(function () { return _this.container
57
+ .withNetwork(config.network)
58
+ .withNetworkAliases(_this.networkAlias)
59
+ .start(); })
60
+ .then(function (started) { return _this.started = started; })
61
+ .then(function () { return _this.endpointBuilder(_this.started.getFirstMappedPort()); })
62
+ .tap(function (url) { return _this.LOGGER.debug(url); })];
63
+ });
64
+ }); };
65
+ this.stop = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
66
+ return [2 /*return*/, this.started.stop().then(function () { return undefined; })];
67
+ }); }); };
68
+ this.LOGGER = logging_1.LoggerFactory.create("CONTAINER[".concat(name, "]"));
69
+ var generic = new testcontainers_1.GenericContainer(image);
70
+ var withEnvironment = environment ? generic.withEnvironment(environment) : generic;
71
+ var withBindMounts = bindMounts ? withEnvironment.withBindMounts(bindMounts) : withEnvironment;
72
+ var withExposedPorts = exposedPorts ? withBindMounts.withExposedPorts.apply(withBindMounts, exposedPorts) : withBindMounts;
73
+ var withLogConsumer = logConsumer ? withExposedPorts.withLogConsumer(logConsumer) : withExposedPorts;
74
+ this.container = startup ? withLogConsumer.withWaitStrategy(startup.waitStrategy).withStartupTimeout(startup.timeout) : withLogConsumer;
75
+ this.networkAlias = networkAlias;
76
+ this.endpointBuilder = endpointBuilder !== null && endpointBuilder !== void 0 ? endpointBuilder : (function (port) { return "http://localhost:".concat(port); });
77
+ }
78
+ return Container;
79
+ }());
80
+ ;
@@ -95,13 +95,9 @@ var Promised = /** @class */ (function () {
95
95
  .then(function () { return _this.service.start(config); })];
96
96
  });
97
97
  }); };
98
- this.stop = function () { return __awaiter(_this, void 0, void 0, function () {
99
- var _this = this;
100
- return __generator(this, function (_a) {
101
- return [2 /*return*/, Promise.resolve(this.LOGGER.info('stopped'))
102
- .then(function () { return _this.service.stop(); })];
103
- });
104
- }); };
98
+ this.stop = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
99
+ return [2 /*return*/, this.service.stop()];
100
+ }); }); };
105
101
  this.name = (0, crypto_1.randomUUID)();
106
102
  this.LOGGER = logging_1.LoggerFactory.create("PROMISED[".concat(this.name, "]"));
107
103
  }
@@ -7,6 +7,8 @@ var sqs_1 = require("./sqs");
7
7
  var dynamodb_1 = require("./dynamodb");
8
8
  var logging_1 = require("@yopdev/logging");
9
9
  var sns_1 = require("./sns");
10
+ var tunnel_1 = require("./tunnel");
11
+ var s3_1 = require("./s3");
10
12
  var DevServer = /** @class */ (function () {
11
13
  function DevServer(name, service, config) {
12
14
  var _this = this;
@@ -32,6 +34,7 @@ var DevServer = /** @class */ (function () {
32
34
  network: infra.network,
33
35
  sqs: new sqs_1.Sqs(infra.aws),
34
36
  sns: new sns_1.Sns(infra.aws),
37
+ s3: new s3_1.S3(infra.aws),
35
38
  dynamo: new dynamodb_1.DynamoDb(infra.aws),
36
39
  eventsProxy: {
37
40
  topic: {
@@ -39,12 +42,13 @@ var DevServer = /** @class */ (function () {
39
42
  }
40
43
  },
41
44
  }); }); }); })
42
- .then(function (config) { _this.LOGGER.debug('starting. config is %o', config); return config; })
45
+ .tap(function (config) { return _this.LOGGER.debug('config is %o', config); })
43
46
  .then(function (aws) { return _this.service.start(aws); })
44
47
  .then(function () { return _this.LOGGER.info('started'); })
45
48
  .then(function () { return _this; });
46
49
  };
47
50
  this.stop = function () { return _this.service.stop()
51
+ .then(tunnel_1.terminate)
48
52
  .then(function () { var _a; return (_a = _this.localStack) === null || _a === void 0 ? void 0 : _a.stop(); })
49
53
  .then(function () { return _this.LOGGER.info('stopped'); }); };
50
54
  this.LOGGER = logging_1.LoggerFactory.create("DEVSERVER[".concat(name, "]"));
@@ -40,6 +40,7 @@ exports.DynamoDb = exports.newDynamoDbTable = void 0;
40
40
  var client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
41
41
  var logging_1 = require("@yopdev/logging");
42
42
  var services_1 = require("./services");
43
+ var assert_1 = require("./assert");
43
44
  var newDynamoDbTable = function (name, config, callback) { return new services_1.Service(new DynamoDbTableCreator(name, config.command), callback); };
44
45
  exports.newDynamoDbTable = newDynamoDbTable;
45
46
  var DynamoDbTableCreator = /** @class */ (function () {
@@ -51,12 +52,11 @@ var DynamoDbTableCreator = /** @class */ (function () {
51
52
  var _this = this;
52
53
  return __generator(this, function (_a) {
53
54
  return [2 /*return*/, config.dynamo.createTable(this.command)
54
- .then(function () { return _this.LOGGER.info('created'); })
55
+ .tap(function (output) { return _this.LOGGER.debug(output); })
55
56
  .then(function () { return _this.name; })];
56
57
  });
57
58
  }); };
58
- this.stop = function () { return Promise.resolve()
59
- .then(function () { return _this.LOGGER.info('stopped'); }); };
59
+ this.stop = function () { return Promise.resolve(); };
60
60
  this.LOGGER = logging_1.LoggerFactory.create("TABLE[".concat(name, "]"));
61
61
  }
62
62
  return DynamoDbTableCreator;
@@ -69,7 +69,7 @@ var DynamoDb = /** @class */ (function () {
69
69
  return __generator(this, function (_a) {
70
70
  return [2 /*return*/, this.client
71
71
  .send(factory) //
72
- .then(function (table) { var _a; LOGGER.info('table created %s', (_a = table.TableDescription) === null || _a === void 0 ? void 0 : _a.TableName); return table; })
72
+ .tap(function (table) { return LOGGER.debug('created %s', (0, assert_1.assertNotUndefined)(table.TableDescription).TableName); })
73
73
  .catch(function (reason) {
74
74
  LOGGER.error('failed to create table');
75
75
  if (reason.name !== 'ResourceInUseException')
@@ -78,7 +78,6 @@ var DynamoDb = /** @class */ (function () {
78
78
  });
79
79
  }); };
80
80
  this.client = new client_dynamodb_1.DynamoDBClient(config);
81
- LOGGER.debug('initialized');
82
81
  }
83
82
  return DynamoDb;
84
83
  }());
@@ -1,10 +1,13 @@
1
- import { SQSEvent } from 'aws-lambda';
1
+ import { SNSMessageAttributes, SQSEvent, SQSRecord } from 'aws-lambda';
2
+ import { Message } from '@aws-sdk/client-sqs';
2
3
  import { Service } from './services';
3
4
  export declare const newEventsProxy: (name: string, config: {
4
5
  handlers: EventHandler[];
5
6
  topic?: string;
6
- }) => Service<any>;
7
+ mapper?: (message: Message) => SQSRecord;
8
+ }) => Service<void>;
7
9
  export type EventHandler = {
10
+ name: string;
8
11
  handler: (event: SQSEvent) => Promise<unknown>;
9
- matcher: (subject: string) => boolean;
12
+ matcher: (subject: string, attributes: SNSMessageAttributes) => boolean;
10
13
  };
@@ -43,13 +43,14 @@ var logging_1 = require("@yopdev/logging");
43
43
  var stoppable_1 = require("./stoppable");
44
44
  var assert_1 = require("./assert");
45
45
  var services_1 = require("./services");
46
- var newEventsProxy = function (name, config) { return new services_1.Service(new EventsProxy(name, config.handlers, config.topic)); };
46
+ var newEventsProxy = function (name, config) { var _a; return new services_1.Service(new EventsProxy(name, config.handlers, (_a = config.mapper) !== null && _a !== void 0 ? _a : mappers_1.mapToLambdaSqsRecord, config.topic)); };
47
47
  exports.newEventsProxy = newEventsProxy;
48
48
  var EventsProxy = /** @class */ (function () {
49
- function EventsProxy(name, handlers, topic) {
49
+ function EventsProxy(name, handlers, mapper, topic) {
50
50
  var _this = this;
51
51
  this.name = name;
52
52
  this.handlers = handlers;
53
+ this.mapper = mapper;
53
54
  this.topic = topic;
54
55
  this.pollingFrequency = 1;
55
56
  this.stopped = true;
@@ -60,13 +61,13 @@ var EventsProxy = /** @class */ (function () {
60
61
  return __generator(this, function (_b) {
61
62
  return [2 /*return*/, this.queueConnectedToTopic(config.sns, (_a = this.topic) !== null && _a !== void 0 ? _a : config.eventsProxy.topic.arn, config.sqs, this.queueName())
62
63
  .then(function (url) { return _this.startEventsConsumer(config.sqs.client, url); })
63
- .then(function () { return _this.stopped = false; })
64
- .then(function () { return undefined; })];
64
+ .tap(function () { return _this.stopped = false; })
65
+ .then(function (consumer) { return _this.LOGGER.debug(consumer); })];
65
66
  });
66
67
  }); };
67
68
  this.queueConnectedToTopic = function (sns, topic, sqs, queue) { return __awaiter(_this, void 0, void 0, function () {
68
69
  return __generator(this, function (_a) {
69
- return [2 /*return*/, sqs.createNamedQueue(queue)
70
+ return [2 /*return*/, sqs.createStandardQueue(queue)
70
71
  .then(function (queue) { return sns
71
72
  .createSubscription({ arn: topic }, { arn: queue.arn })
72
73
  .then(function () { return queue.url; }); })];
@@ -89,41 +90,36 @@ var EventsProxy = /** @class */ (function () {
89
90
  }); };
90
91
  this.extractErrorMessage = function (e) { return typeof e === 'string' ? e : e.message !== undefined && typeof e.message === 'string' ? e.message : ''; };
91
92
  this.onEachMessage = function (message) {
92
- var body = (0, assert_1.assertNotUndefined)(message.Body, 'body is not present');
93
- var subject = JSON.parse(body).Subject;
94
93
  if (_this.stopped) {
95
- _this.LOGGER.warn('stopped events proxy received message with subject %s', subject);
94
+ _this.LOGGER.warn('stopped events proxy received message %o', message);
96
95
  return;
97
96
  }
98
- var handlers = _this.handlers.filter(function (handler) { return handler.matcher(subject); });
97
+ var body = (0, assert_1.assertNotUndefined)(message.Body, 'body is not present');
98
+ var json = JSON.parse(body);
99
+ var attributes = json.MessageAttributes;
100
+ var subject = json.Subject;
101
+ var handlers = _this.handlers.filter(function (handler) { return handler.matcher(subject, attributes); });
99
102
  if (handlers.length === 0) {
100
- _this.LOGGER.warn('no handlers found for subject %s, message %o', subject, message);
103
+ _this.LOGGER.warn('no handlers found for message %o', message);
101
104
  }
105
+ var record = _this.mapper(message);
102
106
  handlers.forEach(function (handler) {
103
- var record = (0, mappers_1.mapToLambdaSqsRecord)(message);
104
- handler
107
+ return handler
105
108
  .handler({ Records: [record] })
106
109
  .then(function () {
107
- var _a;
108
- var json = JSON.parse(record.body);
109
- var subject = json.Subject || ((_a = json.Message) === null || _a === void 0 ? void 0 : _a.eventname) || 'unknown';
110
- _this.LOGGER.debug('subject accepted %s', subject);
110
+ _this.LOGGER.debug('handler %s accepted message', handler.name);
111
111
  })
112
112
  .catch(function (e) {
113
113
  var error = _this.extractErrorMessage(e);
114
- _this.LOGGER.error(e, 'failed %s with %s', subject, error);
114
+ _this.LOGGER.error(e, 'handler %s failed with %s', handler.name, error);
115
115
  });
116
116
  });
117
117
  };
118
- this.stop = function () { return __awaiter(_this, void 0, void 0, function () {
119
- var _this = this;
120
- return __generator(this, function (_a) {
121
- return [2 /*return*/, Promise.resolve(this.consumer)
122
- .then(function (consumer) { return consumer !== undefined ? (0, stoppable_1.stopConsumer)(consumer, _this.pollingFrequency).then(function () { return 'stopped'; }) : 'not started'; })
123
- .then(function (status) { return _this.LOGGER.info(status); })];
124
- });
125
- }); };
118
+ this.stop = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
119
+ return [2 /*return*/, (0, stoppable_1.stopConsumer)(this.pollingFrequency, this.consumer)];
120
+ }); }); };
126
121
  this.LOGGER = logging_1.LoggerFactory.create("SNS->SQS[".concat(name, "]"));
122
+ this.LOGGER.debug('handling events from %s', topic !== null && topic !== void 0 ? topic : 'the event bus');
127
123
  }
128
124
  return EventsProxy;
129
125
  }());
@@ -16,7 +16,7 @@ export declare class HttpServer implements Lifecycle<string> {
16
16
  constructor(name: string, settings: HttpSettings, handler: (request: IncomingMessage, requestBody: string, response: ServerResponse) => void);
17
17
  start: () => Promise<string>;
18
18
  private endpointUrl;
19
- stop: () => Promise<void>;
19
+ stop: () => Promise<any>;
20
20
  }
21
21
  export type HttpSettings = {
22
22
  protocol: string;
@@ -15,14 +15,13 @@ var HttpServer = /** @class */ (function () {
15
15
  this.settings = settings;
16
16
  this.handler = handler;
17
17
  this.start = function () { return _this.server
18
- .then(function () { return _this.LOGGER.info('listening on %s', (0, assert_1.assertNotUndefined)(_this.address).port); })
18
+ .then(function () { return _this.LOGGER.debug('listening [%s]', (0, assert_1.assertNotUndefined)(_this.address).port); })
19
19
  .then(function () { return _this.endpointUrl(); }); };
20
20
  this.endpointUrl = function () {
21
21
  var address = (0, assert_1.assertNotUndefined)(_this.address, 'server not started');
22
22
  return "".concat(_this.protocol, "//").concat(address.address, ":").concat(address.port, "/");
23
23
  };
24
- this.stop = function () { return _this.server.then(function (server) { return server.close(); })
25
- .then(function () { return _this.LOGGER.info('stop %s', (0, assert_1.assertNotUndefined)(_this.address).port); }); };
24
+ this.stop = function () { return _this.server.then(function (server) { return server.close(); }).then(function () { return undefined; }); };
26
25
  var server = (0, http_1.createServer)(function (req, res) {
27
26
  req.setEncoding('utf-8');
28
27
  var body = '';
@@ -1,11 +1,22 @@
1
1
  export { DevServer } from './dev-server';
2
2
  export { newHttpServer as httpServer } from './http-server';
3
- export { newLambdaHttpProxy as lambdaHttpProxy } from './lambda-http-proxy';
3
+ export { newLambdaHttpProxy as lambdaHttpProxy, UNAUTHORIZED } from './lambda-http-proxy';
4
4
  export { newSnsHttpProxy as snsHttpProxy } from './sns-http-proxy';
5
5
  export { newInternalQueue as internalQueue } from './internal-queue';
6
6
  export { newEventsProxy as eventsProxy } from './event-proxy';
7
7
  export { newScheduledTasks as scheduledTasks } from './scheduled-tasks';
8
8
  export { newPreTrafficHooks as preTrafficHooks } from './pre-traffic-hooks';
9
9
  export { newDynamoDbTable as dynamoDbTable } from './dynamodb';
10
+ export { newContainer as container } from './container';
11
+ export { newTunnel as tunnel } from './tunnel';
10
12
  export { all as allOf, oneThenOther } from './factories';
11
13
  export { lazy, promised } from './deferred';
14
+ export { Lifecycle, Service } from './services';
15
+ export { DevServerConfig } from './config';
16
+ export { Route } from './lambda-http-proxy';
17
+ export { mapToLambdaEvent as defaultApiGatewayLambdaMapper, mapToLambdaSqsRecord as defaultSqsLambdaMapper } from './mappers';
18
+ declare global {
19
+ interface Promise<T> {
20
+ tap(onfulfilled?: (value: T) => void, onrejected?: (reason: unknown) => void): Promise<T>;
21
+ }
22
+ }
package/dist/src/index.js CHANGED
@@ -1,12 +1,49 @@
1
1
  "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ var __generator = (this && this.__generator) || function (thisArg, body) {
12
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
+ function verb(n) { return function (v) { return step([n, v]); }; }
15
+ function step(op) {
16
+ if (f) throw new TypeError("Generator is already executing.");
17
+ while (g && (g = 0, op[0] && (_ = 0)), _) try {
18
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
19
+ if (y = 0, t) op = [op[0] & 2, t.value];
20
+ switch (op[0]) {
21
+ case 0: case 1: t = op; break;
22
+ case 4: _.label++; return { value: op[1], done: false };
23
+ case 5: _.label++; y = op[1]; op = [0]; continue;
24
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
25
+ default:
26
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
27
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
28
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
29
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
30
+ if (t[2]) _.ops.pop();
31
+ _.trys.pop(); continue;
32
+ }
33
+ op = body.call(thisArg, _);
34
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
35
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
+ }
37
+ };
2
38
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.promised = exports.lazy = exports.oneThenOther = exports.allOf = exports.dynamoDbTable = exports.preTrafficHooks = exports.scheduledTasks = exports.eventsProxy = exports.internalQueue = exports.snsHttpProxy = exports.lambdaHttpProxy = exports.httpServer = exports.DevServer = void 0;
39
+ exports.defaultSqsLambdaMapper = exports.defaultApiGatewayLambdaMapper = exports.Service = exports.promised = exports.lazy = exports.oneThenOther = exports.allOf = exports.tunnel = exports.container = exports.dynamoDbTable = exports.preTrafficHooks = exports.scheduledTasks = exports.eventsProxy = exports.internalQueue = exports.snsHttpProxy = exports.UNAUTHORIZED = exports.lambdaHttpProxy = exports.httpServer = exports.DevServer = void 0;
4
40
  var dev_server_1 = require("./dev-server");
5
41
  Object.defineProperty(exports, "DevServer", { enumerable: true, get: function () { return dev_server_1.DevServer; } });
6
42
  var http_server_1 = require("./http-server");
7
43
  Object.defineProperty(exports, "httpServer", { enumerable: true, get: function () { return http_server_1.newHttpServer; } });
8
44
  var lambda_http_proxy_1 = require("./lambda-http-proxy");
9
45
  Object.defineProperty(exports, "lambdaHttpProxy", { enumerable: true, get: function () { return lambda_http_proxy_1.newLambdaHttpProxy; } });
46
+ Object.defineProperty(exports, "UNAUTHORIZED", { enumerable: true, get: function () { return lambda_http_proxy_1.UNAUTHORIZED; } });
10
47
  var sns_http_proxy_1 = require("./sns-http-proxy");
11
48
  Object.defineProperty(exports, "snsHttpProxy", { enumerable: true, get: function () { return sns_http_proxy_1.newSnsHttpProxy; } });
12
49
  var internal_queue_1 = require("./internal-queue");
@@ -19,9 +56,28 @@ var pre_traffic_hooks_1 = require("./pre-traffic-hooks");
19
56
  Object.defineProperty(exports, "preTrafficHooks", { enumerable: true, get: function () { return pre_traffic_hooks_1.newPreTrafficHooks; } });
20
57
  var dynamodb_1 = require("./dynamodb");
21
58
  Object.defineProperty(exports, "dynamoDbTable", { enumerable: true, get: function () { return dynamodb_1.newDynamoDbTable; } });
59
+ var container_1 = require("./container");
60
+ Object.defineProperty(exports, "container", { enumerable: true, get: function () { return container_1.newContainer; } });
61
+ var tunnel_1 = require("./tunnel");
62
+ Object.defineProperty(exports, "tunnel", { enumerable: true, get: function () { return tunnel_1.newTunnel; } });
22
63
  var factories_1 = require("./factories");
23
64
  Object.defineProperty(exports, "allOf", { enumerable: true, get: function () { return factories_1.all; } });
24
65
  Object.defineProperty(exports, "oneThenOther", { enumerable: true, get: function () { return factories_1.oneThenOther; } });
25
66
  var deferred_1 = require("./deferred");
26
67
  Object.defineProperty(exports, "lazy", { enumerable: true, get: function () { return deferred_1.lazy; } });
27
68
  Object.defineProperty(exports, "promised", { enumerable: true, get: function () { return deferred_1.promised; } });
69
+ var services_1 = require("./services");
70
+ Object.defineProperty(exports, "Service", { enumerable: true, get: function () { return services_1.Service; } });
71
+ var mappers_1 = require("./mappers");
72
+ Object.defineProperty(exports, "defaultApiGatewayLambdaMapper", { enumerable: true, get: function () { return mappers_1.mapToLambdaEvent; } });
73
+ Object.defineProperty(exports, "defaultSqsLambdaMapper", { enumerable: true, get: function () { return mappers_1.mapToLambdaSqsRecord; } });
74
+ Promise.prototype.tap = function (onfulfilled, onrejected) {
75
+ return __awaiter(this, void 0, void 0, function () {
76
+ var _this = this;
77
+ return __generator(this, function (_a) {
78
+ return [2 /*return*/, this.then(onfulfilled, onrejected).then(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
79
+ return [2 /*return*/, this];
80
+ }); }); })];
81
+ });
82
+ });
83
+ };
@@ -1,8 +1,11 @@
1
1
  import { Queue } from "./sqs";
2
- import { SQSEvent } from "aws-lambda";
2
+ import { SQSEvent, SQSRecord } from "aws-lambda";
3
3
  import { Service, Callback } from "./services";
4
+ import { Message } from "@aws-sdk/client-sqs";
4
5
  export declare const newInternalQueue: (name: string, config: {
5
- index: number;
6
+ name: string;
6
7
  visibility: number;
7
8
  handler: (queue: Queue) => (e: SQSEvent) => Promise<void>;
9
+ fifo: boolean;
10
+ mapper?: (message: Message) => SQSRecord;
8
11
  }, callback?: Callback<string>) => Service<string>;
@@ -42,21 +42,26 @@ var sqs_consumer_1 = require("sqs-consumer");
42
42
  var stoppable_1 = require("./stoppable");
43
43
  var mappers_1 = require("./mappers");
44
44
  var services_1 = require("./services");
45
- var newInternalQueue = function (name, config, callback) { return new services_1.Service(new InternalQueue(name, config.visibility, config.handler, config.index), callback); };
45
+ var newInternalQueue = function (name, config, callback) {
46
+ var _a;
47
+ return new services_1.Service(new InternalQueue(name, config.visibility, config.handler, function (sqs) { return config.fifo ? sqs.createFifoQueue : sqs.createStandardQueue; }, (_a = config.mapper) !== null && _a !== void 0 ? _a : mappers_1.mapToLambdaSqsRecord), callback);
48
+ };
46
49
  exports.newInternalQueue = newInternalQueue;
47
50
  var InternalQueue = /** @class */ (function () {
48
- function InternalQueue(name, visibility, handler, index) {
51
+ function InternalQueue(name, visibility, handler, creator, mapper) {
49
52
  var _this = this;
50
53
  this.name = name;
51
54
  this.visibility = visibility;
52
55
  this.handler = handler;
56
+ this.creator = creator;
57
+ this.mapper = mapper;
53
58
  this.start = function (config) { return _this.create(config.sqs); };
54
59
  this.create = function (sqs) { return __awaiter(_this, void 0, void 0, function () {
55
60
  var _this = this;
56
61
  return __generator(this, function (_a) {
57
- return [2 /*return*/, this.createQueue(sqs, this.queueName)
62
+ return [2 /*return*/, this.createQueue(sqs, this.name)
58
63
  .then(function (queue) { return _this
59
- .createConsumer(sqs.client, _this.queueName, queue.url, _this.handler(queue), _this.visibility)
64
+ .createConsumer(sqs.client, _this.name, queue.url, _this.handler(queue), _this.visibility)
60
65
  .then(function () { return queue.url; }); })];
61
66
  });
62
67
  }); };
@@ -68,7 +73,7 @@ var InternalQueue = /** @class */ (function () {
68
73
  waitTimeSeconds: visibility,
69
74
  sqs: sqs,
70
75
  handleMessage: function (message) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
71
- return [2 /*return*/, handler({ Records: [(0, mappers_1.mapToLambdaSqsRecord)(message)] })];
76
+ return [2 /*return*/, handler({ Records: [this.mapper(message)] })];
72
77
  }); }); },
73
78
  }))
74
79
  .then(function (consumer) {
@@ -89,18 +94,14 @@ var InternalQueue = /** @class */ (function () {
89
94
  .then(function () { return _this; })];
90
95
  });
91
96
  }); };
92
- this.stop = function () { return Promise.resolve(_this.state)
93
- .then(function (state) { return state !== undefined ? (0, stoppable_1.stopConsumer)(state.consumer, state.visibility).then(function () { return 'stopped'; }) : 'not started'; })
94
- .then(function (status) { return _this.LOGGER.info(status); }); };
95
- this.queueName = (index + 1000).toString().padStart(10, '0');
97
+ this.stop = function () { return (0, stoppable_1.stopConsumer)(_this.state.visibility, _this.state.consumer); };
96
98
  this.LOGGER = logging_1.LoggerFactory.create("INTERNALQUEUE[".concat(name, "]"));
97
99
  }
98
100
  InternalQueue.prototype.createQueue = function (sqs, name) {
99
101
  return __awaiter(this, void 0, void 0, function () {
100
102
  var _this = this;
101
103
  return __generator(this, function (_a) {
102
- return [2 /*return*/, sqs
103
- .createNamedQueue(name) //
104
+ return [2 /*return*/, this.creator(sqs)(name) //
104
105
  .then(function (queue) {
105
106
  _this.LOGGER.info('created: %s', queue.url);
106
107
  return queue;
@@ -1,13 +1,20 @@
1
1
  import { HttpSettings } from "./http-server";
2
- import { APIGatewayProxyEvent, APIGatewayProxyResult } from "aws-lambda";
2
+ import { APIGatewayEventDefaultAuthorizerContext, APIGatewayProxyEvent, APIGatewayProxyResult } from "aws-lambda";
3
+ import { IncomingMessage } from "http";
3
4
  import { Service, Callback } from "./services";
5
+ export declare const UNAUTHORIZED: Error;
4
6
  export declare const newLambdaHttpProxy: (name: string, config: {
5
7
  settings: HttpSettings;
6
8
  routes: Route[];
9
+ mapper?: (request: IncomingMessage, body: string) => Promise<APIGatewayProxyEvent>;
10
+ authorizer?: Authorizer;
7
11
  }, callback?: Callback<string>) => Service<string>;
8
- type Route = {
12
+ export type Route = {
9
13
  method: RegExp;
10
14
  path: RegExp;
15
+ weight: number;
16
+ authorizer?: Authorizer;
11
17
  handler: (event: APIGatewayProxyEvent) => Promise<APIGatewayProxyResult>;
12
18
  };
19
+ type Authorizer = (authorization: string) => Promise<APIGatewayEventDefaultAuthorizerContext | undefined>;
13
20
  export {};
@@ -36,33 +36,51 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
36
36
  }
37
37
  };
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
- exports.newLambdaHttpProxy = void 0;
39
+ exports.newLambdaHttpProxy = exports.UNAUTHORIZED = void 0;
40
40
  var logging_1 = require("@yopdev/logging");
41
41
  var http_server_1 = require("./http-server");
42
42
  var mappers_1 = require("./mappers");
43
43
  var responses_1 = require("./responses");
44
44
  var services_1 = require("./services");
45
- var newLambdaHttpProxy = function (name, config, callback) { return new services_1.Service(new LambdaHttpProxy(name, config.settings, config.routes), callback); };
45
+ exports.UNAUTHORIZED = new Error('UNAUTHORIZED');
46
+ var newLambdaHttpProxy = function (name, config, callback) {
47
+ var _a, _b;
48
+ return new services_1.Service(new LambdaHttpProxy(name, config.settings, config.routes, (_a = config.mapper) !== null && _a !== void 0 ? _a : mappers_1.mapToLambdaEvent, (_b = config.authorizer) !== null && _b !== void 0 ? _b : (function () { return Promise.resolve(undefined); })), callback);
49
+ };
46
50
  exports.newLambdaHttpProxy = newLambdaHttpProxy;
47
51
  var LambdaHttpProxy = /** @class */ (function () {
48
- function LambdaHttpProxy(name, settings, routes) {
52
+ function LambdaHttpProxy(name, settings, routes, mapper, defaultAuthorizer) {
49
53
  var _this = this;
50
54
  this.name = name;
51
55
  this.routes = routes;
56
+ this.mapper = mapper;
57
+ this.defaultAuthorizer = defaultAuthorizer;
52
58
  this.start = function () { return _this.server.start(); };
53
- this.stop = function () { return _this.server.stop()
54
- .then(function () { return _this.LOGGER.info('stopped'); }); };
55
- this.handler = function (lambdaHandler) {
59
+ this.stop = function () { return _this.server.stop(); };
60
+ this.handler = function (authorizer, lambdaHandler) {
56
61
  return function (request, body, response) {
57
- return lambdaHandler((0, mappers_1.mapToLambdaEvent)(request, body))
58
- .then(function (lambda) {
59
- var _a, _b, _c, _d, _e, _f;
60
- return (0, responses_1.writeResponse)(response, lambda.statusCode, lambda.body, (_c = (_b = (_a = lambda.headers) === null || _a === void 0 ? void 0 : _a['Content-Type']) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : undefined, (_f = (_e = (_d = lambda.headers) === null || _d === void 0 ? void 0 : _d['Location']) === null || _e === void 0 ? void 0 : _e.toString()) !== null && _f !== void 0 ? _f : undefined);
61
- })
62
- .catch(function (e) {
63
- _this.LOGGER.error(e, 'request failed to execute');
64
- (0, responses_1.internalServerError)(response, e.body);
65
- });
62
+ return _this.mapper(request, body)
63
+ .then(function (proxyEvent) { return __awaiter(_this, void 0, void 0, function () {
64
+ var _this = this;
65
+ return __generator(this, function (_a) {
66
+ return [2 /*return*/, authorizer(proxyEvent.headers['authorization'])
67
+ .then(function (context) { return __awaiter(_this, void 0, void 0, function () {
68
+ var _this = this;
69
+ return __generator(this, function (_a) {
70
+ proxyEvent.requestContext.authorizer = context;
71
+ return [2 /*return*/, lambdaHandler(proxyEvent)
72
+ .then(function (lambda) {
73
+ var _a, _b, _c, _d, _e, _f;
74
+ return (0, responses_1.writeResponse)(response, lambda.statusCode, lambda.body, (_c = (_b = (_a = lambda.headers) === null || _a === void 0 ? void 0 : _a['content-type']) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : undefined, (_f = (_e = (_d = lambda.headers) === null || _d === void 0 ? void 0 : _d['location']) === null || _e === void 0 ? void 0 : _e.toString()) !== null && _f !== void 0 ? _f : undefined);
75
+ })
76
+ .catch(function (e) {
77
+ _this.LOGGER.error(e, 'request failed to execute');
78
+ (0, responses_1.internalServerError)(response, e.body);
79
+ })];
80
+ });
81
+ }); }, function (e) { return e === exports.UNAUTHORIZED ? (0, responses_1.writeResponse)(response, 401, '') : (0, responses_1.internalServerError)(response, e); })];
82
+ });
83
+ }); });
66
84
  };
67
85
  };
68
86
  this.fallback = function (request, _, response) { return __awaiter(_this, void 0, void 0, function () {
@@ -76,12 +94,13 @@ var LambdaHttpProxy = /** @class */ (function () {
76
94
  var _a;
77
95
  return ((_a = _this.routes.filter(function (r) { return request.method.match(r.method); })
78
96
  .filter(function (r) { return request.url.match(r.path); })
79
- .sort(function (r1, r2) { return r2.path.source.length - r1.path.source.length; })
80
- .map(function (r) { return _this.handler(r.handler); })
97
+ .sort(function (r1, r2) { return r2.weight - r1.weight; })
98
+ .map(function (r) { var _a; return _this.handler((_a = r.authorizer) !== null && _a !== void 0 ? _a : _this.defaultAuthorizer, r.handler); })
81
99
  .find(function () { return true; })) !== null && _a !== void 0 ? _a : _this.fallback)(request, body, response);
82
100
  };
83
101
  this.server = new http_server_1.HttpServer(name, settings, this.resolveRoute);
84
102
  this.LOGGER = logging_1.LoggerFactory.create("HTTP->LAMBDA[".concat(this.name, "]"));
103
+ this.LOGGER.info('registered %i routes', routes.length);
85
104
  }
86
105
  return LambdaHttpProxy;
87
106
  }());
@@ -57,12 +57,13 @@ var LocalStack = /** @class */ (function () {
57
57
  accessKeyId: 'dummy',
58
58
  secretAccessKey: 'dummy'
59
59
  }
60
- }); })];
60
+ }); })
61
+ .tap(function () { return LOGGER.debug('started'); })];
61
62
  });
62
63
  }); };
63
64
  this.stop = function () { return Promise.resolve(_this.started)
64
65
  .then(function (container) { return container ? container.stop().then(function () { return 'stopped'; }) : 'not started'; })
65
- .then(function (status) { return LOGGER.info(status); }); };
66
+ .then(function (status) { return LOGGER.debug(status); }); };
66
67
  var concreteConfig = this.configOrDefaults(config);
67
68
  var container = new testcontainers_1.GenericContainer(concreteConfig.localStackDockerImage);
68
69
  var localStatePath = concreteConfig.localStateBindMount;
@@ -83,7 +84,6 @@ var LocalStack = /** @class */ (function () {
83
84
  .start()
84
85
  .then(function (container) { return _this.started = container; })
85
86
  .then(function (container) { return "".concat(PROTOCOL, "://").concat(container.getHost(), ":").concat(container.getMappedPort(SERVICES_PORT)); }); };
86
- LOGGER.debug('initialized');
87
87
  }
88
88
  LocalStack.prototype.configOrDefaults = function (config) {
89
89
  var selectedServicesPort = config === null || config === void 0 ? void 0 : config.boundServicesPort;
@@ -3,4 +3,4 @@ import { Message } from "@aws-sdk/client-sqs";
3
3
  import { APIGatewayProxyEvent, SQSRecord } from "aws-lambda";
4
4
  import { IncomingMessage } from "http";
5
5
  export declare const mapToLambdaSqsRecord: (message: Message) => SQSRecord;
6
- export declare function mapToLambdaEvent(req: IncomingMessage, requestBody: string): APIGatewayProxyEvent;
6
+ export declare function mapToLambdaEvent(req: IncomingMessage, requestBody: string): Promise<APIGatewayProxyEvent>;
@@ -1,12 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.mapToLambdaEvent = exports.mapToLambdaSqsRecord = void 0;
4
- var logging_1 = require("@yopdev/logging");
5
4
  var url_1 = require("url");
6
- var LOGGER = logging_1.LoggerFactory.create('MAPPERS');
7
5
  var mapToLambdaSqsRecord = function (message) {
8
6
  if (!message.Body)
9
- throw new Error("message Body must be present: ".concat(message.Body));
7
+ throw new Error('message Body must be present');
10
8
  return {
11
9
  messageId: 'N/A',
12
10
  receiptHandle: 'N/A',
@@ -28,16 +26,17 @@ exports.mapToLambdaSqsRecord = mapToLambdaSqsRecord;
28
26
  function mapToLambdaEvent(req, requestBody) {
29
27
  if (!req.url || !req.method)
30
28
  throw new Error('url and method are required');
31
- var url = new url_1.URL(decodeURIComponent(req.url), "http://".concat(req.headers.host));
29
+ var url = new url_1.URL(req.url, "http://".concat(req.headers.host));
32
30
  var qsp = {};
33
- url.searchParams.forEach(function (v, k) { return (qsp[k] = v); });
34
- var claims = extractClaims(req);
31
+ url.searchParams.forEach(function (v, k) { return (qsp[k] = decodeURIComponent(v)); });
35
32
  var headers = {};
36
33
  if (req.headers['content-type'])
37
- headers['Content-Type'] = req.headers['content-type'];
34
+ headers['content-type'] = req.headers['content-type'];
38
35
  if (req.headers['accept'])
39
- headers['Accept'] = req.headers['accept'];
40
- return {
36
+ headers['accept'] = req.headers['accept'];
37
+ if (req.headers['authorization'])
38
+ headers['authorization'] = req.headers['authorization'];
39
+ return Promise.resolve({
41
40
  httpMethod: req.method,
42
41
  body: requestBody,
43
42
  headers: headers,
@@ -52,7 +51,7 @@ function mapToLambdaEvent(req, requestBody) {
52
51
  requestContext: {
53
52
  accountId: '',
54
53
  apiId: '',
55
- authorizer: { claims: claims },
54
+ authorizer: undefined,
56
55
  httpMethod: '',
57
56
  identity: {
58
57
  accessKey: '',
@@ -85,17 +84,6 @@ function mapToLambdaEvent(req, requestBody) {
85
84
  resourcePath: '',
86
85
  stage: '',
87
86
  },
88
- };
87
+ });
89
88
  }
90
89
  exports.mapToLambdaEvent = mapToLambdaEvent;
91
- function extractClaims(req) {
92
- var _a;
93
- var jwt = (_a = req.headers['authorization']) === null || _a === void 0 ? void 0 : _a.replace('Bearer ', '');
94
- try {
95
- return jwt ? JSON.parse(atob(jwt.split('.')[1])) : null;
96
- }
97
- catch (e) {
98
- LOGGER.warn('Invalid token, claims could not be extracted: %O', jwt);
99
- return undefined;
100
- }
101
- }
@@ -1,11 +1,2 @@
1
- import { Lifecycle, Service, Callback } from './services';
2
- export declare const newPreTrafficHooks: (name: string, hooks: () => Promise<void>[], callback?: Callback<PreTrafficHooks>) => Service<PreTrafficHooks>;
3
- declare class PreTrafficHooks implements Lifecycle<PreTrafficHooks> {
4
- readonly name: string;
5
- private readonly hooks;
6
- private LOGGER;
7
- constructor(name: string, hooks: () => Promise<void>[]);
8
- start: () => Promise<this>;
9
- stop: () => Promise<void>;
10
- }
11
- export {};
1
+ import { Service } from './services';
2
+ export declare const newPreTrafficHooks: (name: string, hooks: () => Promise<void>[]) => Service<any>;
@@ -39,7 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
39
39
  exports.newPreTrafficHooks = void 0;
40
40
  var logging_1 = require("@yopdev/logging");
41
41
  var services_1 = require("./services");
42
- var newPreTrafficHooks = function (name, hooks, callback) { return new services_1.Service(new PreTrafficHooks(name, hooks), callback); };
42
+ var newPreTrafficHooks = function (name, hooks) { return new services_1.Service(new PreTrafficHooks(name, hooks)); };
43
43
  exports.newPreTrafficHooks = newPreTrafficHooks;
44
44
  var PreTrafficHooks = /** @class */ (function () {
45
45
  function PreTrafficHooks(name, hooks) {
@@ -47,22 +47,17 @@ var PreTrafficHooks = /** @class */ (function () {
47
47
  this.name = name;
48
48
  this.hooks = hooks;
49
49
  this.start = function () { return __awaiter(_this, void 0, void 0, function () {
50
- var _this = this;
51
50
  return __generator(this, function (_a) {
52
51
  return [2 /*return*/, Promise
53
52
  .all(this.hooks())
54
- .then(function () { return _this.LOGGER.info('started'); })
55
- .then(function () { return _this; })];
56
- });
57
- }); };
58
- this.stop = function () { return __awaiter(_this, void 0, void 0, function () {
59
- var _this = this;
60
- return __generator(this, function (_a) {
61
- return [2 /*return*/, Promise.resolve()
62
- .then(function () { return _this.LOGGER.info('stopped'); })];
53
+ .then(function () { return undefined; })];
63
54
  });
64
55
  }); };
56
+ this.stop = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
57
+ return [2 /*return*/, Promise.resolve()];
58
+ }); }); };
65
59
  this.LOGGER = logging_1.LoggerFactory.create("PRETRAFFIC[".concat(name, "]"));
60
+ this.LOGGER.info('%i hooks registered', hooks.length);
66
61
  }
67
62
  return PreTrafficHooks;
68
63
  }());
@@ -1,4 +1,4 @@
1
1
  /// <reference types="node" />
2
2
  import { ServerResponse } from 'http';
3
- export declare function internalServerError(res: ServerResponse, body: string): void;
3
+ export declare function internalServerError(res: ServerResponse, body: any): void;
4
4
  export declare function writeResponse(res: ServerResponse, statusCode: number, body: string, contentType?: string, location?: string): void;
@@ -1,8 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.writeResponse = exports.internalServerError = void 0;
4
+ var logging_1 = require("@yopdev/logging");
5
+ var LOG = logging_1.LoggerFactory.create('RESPONSES');
4
6
  function internalServerError(res, body) {
5
- return writeResponse(res, 500, body);
7
+ LOG.error(body, 'internal server error handled');
8
+ return writeResponse(res, 500, 'internal server error. check system logs');
6
9
  }
7
10
  exports.internalServerError = internalServerError;
8
11
  function writeResponse(res, statusCode, body, contentType, location) {
@@ -0,0 +1,7 @@
1
+ import { CORSConfiguration, S3Client } from '@aws-sdk/client-s3';
2
+ import { AwsConfig } from './config';
3
+ export declare class S3 {
4
+ readonly client: S3Client;
5
+ constructor(aws: AwsConfig);
6
+ createBucket: (name: string, cors?: CORSConfiguration) => Promise<import("@aws-sdk/client-s3").PutBucketCorsCommandOutput>;
7
+ }
package/dist/src/s3.js ADDED
@@ -0,0 +1,74 @@
1
+ "use strict";
2
+ var __assign = (this && this.__assign) || function () {
3
+ __assign = Object.assign || function(t) {
4
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
5
+ s = arguments[i];
6
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
7
+ t[p] = s[p];
8
+ }
9
+ return t;
10
+ };
11
+ return __assign.apply(this, arguments);
12
+ };
13
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
14
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
15
+ return new (P || (P = Promise))(function (resolve, reject) {
16
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
17
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
18
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
19
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
20
+ });
21
+ };
22
+ var __generator = (this && this.__generator) || function (thisArg, body) {
23
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
24
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
25
+ function verb(n) { return function (v) { return step([n, v]); }; }
26
+ function step(op) {
27
+ if (f) throw new TypeError("Generator is already executing.");
28
+ while (g && (g = 0, op[0] && (_ = 0)), _) try {
29
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
30
+ if (y = 0, t) op = [op[0] & 2, t.value];
31
+ switch (op[0]) {
32
+ case 0: case 1: t = op; break;
33
+ case 4: _.label++; return { value: op[1], done: false };
34
+ case 5: _.label++; y = op[1]; op = [0]; continue;
35
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
36
+ default:
37
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
38
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
39
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
40
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
41
+ if (t[2]) _.ops.pop();
42
+ _.trys.pop(); continue;
43
+ }
44
+ op = body.call(thisArg, _);
45
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
46
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
47
+ }
48
+ };
49
+ Object.defineProperty(exports, "__esModule", { value: true });
50
+ exports.S3 = void 0;
51
+ var client_s3_1 = require("@aws-sdk/client-s3");
52
+ var logging_1 = require("@yopdev/logging");
53
+ var LOGGER = logging_1.LoggerFactory.create('S3');
54
+ var S3 = /** @class */ (function () {
55
+ function S3(aws) {
56
+ var _this = this;
57
+ this.createBucket = function (name, cors) { return __awaiter(_this, void 0, void 0, function () {
58
+ var _this = this;
59
+ return __generator(this, function (_a) {
60
+ return [2 /*return*/, this.client.send(new client_s3_1.CreateBucketCommand({
61
+ Bucket: name,
62
+ }))
63
+ .then(function () { return cors && _this.client.send(new client_s3_1.PutBucketCorsCommand({
64
+ Bucket: name,
65
+ CORSConfiguration: cors
66
+ })); })
67
+ .tap(function () { return LOGGER.debug('bucket %s created', name); })];
68
+ });
69
+ }); };
70
+ this.client = new client_s3_1.S3Client(__assign({ forcePathStyle: true }, aws));
71
+ }
72
+ return S3;
73
+ }());
74
+ exports.S3 = S3;
@@ -1,17 +1,6 @@
1
- /// <reference types="node" />
2
- import { Lifecycle, Service, Callback } from './services';
3
- export declare const newScheduledTasks: (name: string, schedules: Rate[], callback?: Callback<ScheduledTasks>) => Service<ScheduledTasks>;
4
- declare class ScheduledTasks implements Lifecycle<ScheduledTasks> {
5
- readonly name: string;
6
- private readonly schedules;
7
- private LOGGER;
8
- constructor(name: string, schedules: Rate[]);
9
- intervals: NodeJS.Timeout[];
10
- start: () => Promise<this>;
11
- stop: () => Promise<void>;
12
- }
1
+ import { Service } from './services';
2
+ export declare const newScheduledTasks: (name: string, schedules: Rate[]) => Service<any>;
13
3
  export type Rate = {
14
4
  frequency: number;
15
5
  task: () => Promise<unknown>;
16
6
  };
17
- export {};
@@ -40,7 +40,7 @@ exports.newScheduledTasks = void 0;
40
40
  var logging_1 = require("@yopdev/logging");
41
41
  var timers_1 = require("timers");
42
42
  var services_1 = require("./services");
43
- var newScheduledTasks = function (name, schedules, callback) { return new services_1.Service(new ScheduledTasks(name, schedules), callback); };
43
+ var newScheduledTasks = function (name, schedules) { return new services_1.Service(new ScheduledTasks(name, schedules)); };
44
44
  exports.newScheduledTasks = newScheduledTasks;
45
45
  var ScheduledTasks = /** @class */ (function () {
46
46
  function ScheduledTasks(name, schedules) {
@@ -52,18 +52,14 @@ var ScheduledTasks = /** @class */ (function () {
52
52
  var _this = this;
53
53
  return __generator(this, function (_a) {
54
54
  return [2 /*return*/, Promise.resolve(this.schedules.forEach(function (schedule) { return _this.intervals.push(setInterval(schedule.task, schedule.frequency * 1000)); }))
55
- .then(function () { return _this.LOGGER.info('started'); })
56
- .then(function () { return _this; })];
57
- });
58
- }); };
59
- this.stop = function () { return __awaiter(_this, void 0, void 0, function () {
60
- var _this = this;
61
- return __generator(this, function (_a) {
62
- return [2 /*return*/, Promise.resolve(this.intervals.forEach(function (interval) { return (0, timers_1.clearInterval)(interval); }))
63
- .then(function () { return _this.LOGGER.info('stopped'); })];
55
+ .then(function () { return undefined; })];
64
56
  });
65
57
  }); };
58
+ this.stop = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
59
+ return [2 /*return*/, Promise.resolve(this.intervals.forEach(function (interval) { return (0, timers_1.clearInterval)(interval); }))];
60
+ }); }); };
66
61
  this.LOGGER = logging_1.LoggerFactory.create("SCHEDULER[".concat(name, "]"));
62
+ this.LOGGER.info('registered %i scheduled tasks', schedules.length);
67
63
  }
68
64
  return ScheduledTasks;
69
65
  }());
@@ -29,17 +29,16 @@ var SnsHttpProxy = /** @class */ (function () {
29
29
  this.topic = topic;
30
30
  this.start = function (config) { return Promise.resolve(_this.server)
31
31
  .then(function (server) { return server.start(); })
32
- .then(function (endpoint) {
32
+ .tap(function () {
33
33
  var _a;
34
34
  _this.config = {
35
35
  topic: (_a = _this.topic) !== null && _a !== void 0 ? _a : config.eventsProxy.topic.arn,
36
36
  sns: config.sns
37
37
  };
38
- return endpoint;
39
38
  })
40
39
  .then(function (endpoint) { return endpoint; }); };
41
40
  this.stop = function () { return _this.onlyWhenStarted(_this.server).stop()
42
- .then(function () { return _this.LOGGER.info('stopped'); }); };
41
+ .then(function () { return _this.LOGGER.debug('stopped'); }); };
43
42
  this.handler = function (method, subject) {
44
43
  return function (request, body, response) {
45
44
  return Promise.resolve(((0, assert_1.assertNotUndefined)(_this.config)))
@@ -78,6 +77,7 @@ var SnsHttpProxy = /** @class */ (function () {
78
77
  };
79
78
  this.server = new http_server_1.HttpServer(this.name, this.settings, this.handler(this.method, this.subject));
80
79
  this.LOGGER = logging_1.LoggerFactory.create("HTTP->SNS[".concat(name, "]"));
80
+ this.LOGGER.info('forwarding %s %s events to %s', subject ? "events with ".concat(subject, " subject") : 'all', method, topic !== null && topic !== void 0 ? topic : 'the event bus');
81
81
  }
82
82
  return SnsHttpProxy;
83
83
  }());
package/dist/src/sns.js CHANGED
@@ -50,7 +50,8 @@ var Sns = /** @class */ (function () {
50
50
  .send(new client_sns_1.CreateTopicCommand({
51
51
  Name: topic,
52
52
  }))
53
- .then(function (o) { return (0, assert_1.assertNotUndefined)(o.TopicArn, 'TopicArn is not present'); })];
53
+ .then(function (o) { return (0, assert_1.assertNotUndefined)(o.TopicArn, 'TopicArn is not present'); })
54
+ .tap(function (arn) { return LOGGER.debug('topic %o created', arn); })];
54
55
  });
55
56
  }); };
56
57
  this.createSubscription = function (topic, queue) { return __awaiter(_this, void 0, void 0, function () {
@@ -61,7 +62,7 @@ var Sns = /** @class */ (function () {
61
62
  Protocol: 'sqs',
62
63
  Endpoint: queue.arn,
63
64
  }))
64
- .then(function () { return LOGGER.debug('connected %s to %s', topic.arn, queue.arn); })];
65
+ .then(function () { return LOGGER.debug('subscription %s->%s created', topic.arn, queue.arn); })];
65
66
  });
66
67
  }); };
67
68
  this.publish = function (topic, body, subject, attributes) { return __awaiter(_this, void 0, void 0, function () {
@@ -73,12 +74,11 @@ var Sns = /** @class */ (function () {
73
74
  MessageAttributes: attributes,
74
75
  Subject: subject,
75
76
  }))
76
- .then(function () { return LOGGER.debug('published with subject %s to %s', subject, topic.arn); })
77
+ .then(function () { return LOGGER.trace('published %s[%s]', topic.arn, subject); })
77
78
  .then()];
78
79
  });
79
80
  }); };
80
81
  this.client = new client_sns_1.SNSClient(aws);
81
- LOGGER.debug('initialized');
82
82
  }
83
83
  return Sns;
84
84
  }());
package/dist/src/sqs.d.ts CHANGED
@@ -3,7 +3,9 @@ import { AwsConfig } from "./config";
3
3
  export declare class Sqs {
4
4
  readonly client: SQSClient;
5
5
  constructor(config: AwsConfig);
6
- createNamedQueue: (name: string) => Promise<Queue>;
6
+ createStandardQueue: (name: string) => Promise<Queue>;
7
+ createFifoQueue: (name: string) => Promise<Queue>;
8
+ private createNamedQueue;
7
9
  }
8
10
  export type Queue = {
9
11
  arn: string;
package/dist/src/sqs.js CHANGED
@@ -45,12 +45,21 @@ var LOGGER = logging_1.LoggerFactory.create('SQS');
45
45
  var Sqs = /** @class */ (function () {
46
46
  function Sqs(config) {
47
47
  var _this = this;
48
- this.createNamedQueue = function (name) { return __awaiter(_this, void 0, void 0, function () {
48
+ this.createStandardQueue = function (name) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
49
+ return [2 /*return*/, this.createNamedQueue(name, false)];
50
+ }); }); };
51
+ this.createFifoQueue = function (name) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
52
+ return [2 /*return*/, this.createNamedQueue(name, true)];
53
+ }); }); };
54
+ this.createNamedQueue = function (name, fifo) { return __awaiter(_this, void 0, void 0, function () {
49
55
  var _this = this;
50
56
  return __generator(this, function (_a) {
51
57
  return [2 /*return*/, this.client
52
58
  .send(new client_sqs_1.CreateQueueCommand({
53
- QueueName: name,
59
+ QueueName: fifo ? "".concat(name, ".fifo") : name,
60
+ Attributes: {
61
+ FifoQueue: fifo ? 'true' : 'false',
62
+ }
54
63
  }))
55
64
  .then(function (create) { return _this.client
56
65
  .send(new client_sqs_1.GetQueueAttributesCommand({
@@ -60,11 +69,11 @@ var Sqs = /** @class */ (function () {
60
69
  .then(function (attributes) { return ({
61
70
  url: (0, assert_1.assertNotUndefined)(create.QueueUrl),
62
71
  arn: (0, assert_1.assertNotUndefined)(attributes.Attributes)[QUEUE_NAME_ATTRIBUTE_NAME],
63
- }); }); })];
72
+ }); }); })
73
+ .tap(function (queue) { return LOGGER.debug('created %s', queue.arn); })];
64
74
  });
65
75
  }); };
66
76
  this.client = new client_sqs_1.SQSClient(config);
67
- LOGGER.debug('initialized');
68
77
  }
69
78
  return Sqs;
70
79
  }());
@@ -1,2 +1,2 @@
1
1
  import { Consumer } from "sqs-consumer";
2
- export declare const stopConsumer: (target: Consumer, queueWaitTimeSecs: number) => Promise<void>;
2
+ export declare const stopConsumer: (queueWaitTimeSecs: number, target?: Consumer) => Promise<void>;
@@ -37,12 +37,18 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
37
37
  };
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
39
  exports.stopConsumer = void 0;
40
- var stopConsumer = function (target, queueWaitTimeSecs) { return __awaiter(void 0, void 0, void 0, function () {
40
+ var stopConsumer = function (queueWaitTimeSecs, target) { return __awaiter(void 0, void 0, void 0, function () {
41
41
  return __generator(this, function (_a) {
42
- target.stop();
43
- return [2 /*return*/, new Promise(function (resolve) {
44
- setTimeout(resolve, queueWaitTimeSecs * 1000 + 1);
45
- })];
42
+ if (target) {
43
+ target.stop();
44
+ return [2 /*return*/, new Promise(function (resolve) {
45
+ setTimeout(resolve, queueWaitTimeSecs * 1000 + 1);
46
+ })];
47
+ }
48
+ else {
49
+ return [2 /*return*/, Promise.resolve()];
50
+ }
51
+ return [2 /*return*/];
46
52
  });
47
53
  }); };
48
54
  exports.stopConsumer = stopConsumer;
@@ -0,0 +1,10 @@
1
+ import { Service } from './services';
2
+ export declare const terminate: () => Promise<void>;
3
+ export declare const newTunnel: (config: {
4
+ name: string;
5
+ port: number;
6
+ fixed?: {
7
+ name: string;
8
+ token: string;
9
+ };
10
+ }) => Service<string>;
@@ -0,0 +1,79 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ var __generator = (this && this.__generator) || function (thisArg, body) {
12
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
+ function verb(n) { return function (v) { return step([n, v]); }; }
15
+ function step(op) {
16
+ if (f) throw new TypeError("Generator is already executing.");
17
+ while (g && (g = 0, op[0] && (_ = 0)), _) try {
18
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
19
+ if (y = 0, t) op = [op[0] & 2, t.value];
20
+ switch (op[0]) {
21
+ case 0: case 1: t = op; break;
22
+ case 4: _.label++; return { value: op[1], done: false };
23
+ case 5: _.label++; y = op[1]; op = [0]; continue;
24
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
25
+ default:
26
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
27
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
28
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
29
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
30
+ if (t[2]) _.ops.pop();
31
+ _.trys.pop(); continue;
32
+ }
33
+ op = body.call(thisArg, _);
34
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
35
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
+ }
37
+ };
38
+ Object.defineProperty(exports, "__esModule", { value: true });
39
+ exports.newTunnel = exports.terminate = void 0;
40
+ var services_1 = require("./services");
41
+ var logging_1 = require("@yopdev/logging");
42
+ var ngrok = require("@ngrok/ngrok");
43
+ var assert_1 = require("./assert");
44
+ var terminate = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
45
+ return [2 /*return*/, ngrok.kill()];
46
+ }); }); };
47
+ exports.terminate = terminate;
48
+ var newTunnel = function (config) {
49
+ return new services_1.Service(new Tunnel(config.name, config.port, config.fixed));
50
+ };
51
+ exports.newTunnel = newTunnel;
52
+ var Tunnel = /** @class */ (function () {
53
+ function Tunnel(name, port, domain) {
54
+ var _this = this;
55
+ this.name = name;
56
+ this.port = port;
57
+ this.domain = domain;
58
+ this.start = function () { return __awaiter(_this, void 0, void 0, function () {
59
+ var _this = this;
60
+ var _a, _b;
61
+ return __generator(this, function (_c) {
62
+ return [2 /*return*/, ngrok
63
+ .forward({
64
+ proto: 'http',
65
+ domain: (_a = this.domain) === null || _a === void 0 ? void 0 : _a.name,
66
+ addr: this.port,
67
+ authtoken: (_b = this.domain) === null || _b === void 0 ? void 0 : _b.token,
68
+ })
69
+ .then(function (listener) { return (0, assert_1.assertNotUndefined)(listener.url()); })
70
+ .tap(function (url) { return _this.logger.debug(url); })];
71
+ });
72
+ }); };
73
+ this.stop = function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
74
+ return [2 /*return*/, ngrok.disconnect()];
75
+ }); }); };
76
+ this.logger = logging_1.LoggerFactory.create("TUNNEL[".concat(name, "]"));
77
+ }
78
+ return Tunnel;
79
+ }());
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@yopdev/dev-server",
3
- "version": "1.4.0-alpha.1",
3
+ "version": "1.4.0",
4
4
  "scripts": {
5
5
  "compile": "tsc",
6
6
  "pretest": "npm run compile",
@@ -18,15 +18,17 @@
18
18
  },
19
19
  "dependencies": {
20
20
  "@aws-sdk/client-dynamodb": "^3.451.0",
21
+ "@aws-sdk/client-s3": "^3.451.0",
21
22
  "@aws-sdk/client-sns": "^3.451.0",
22
23
  "@aws-sdk/client-sqs": "^3.451.0",
24
+ "@ngrok/ngrok": "^0.9.1",
23
25
  "@yopdev/logging": "^0.0.2",
24
26
  "sqs-consumer": "^7.4.0",
25
27
  "testcontainers": "^10.2.2"
26
28
  },
27
29
  "repository": {
28
30
  "type": "git",
29
- "url": "github:blockademy/devserver"
31
+ "url": "git+https://github.com/blockademy/devserver.git"
30
32
  },
31
33
  "main": "dist/src/index.js",
32
34
  "types": "dist/src/index.d.ts",