@aesop-fables/triginta 0.8.4 → 0.8.6
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.
- package/lib/http/HttpLambda.js +1 -0
- package/lib/http/HttpLambdaServices.d.ts +2 -1
- package/lib/http/HttpLambdaServices.js +2 -1
- package/lib/sqs/MessagePublisher.d.ts +7 -5
- package/lib/sqs/MessagePublisher.js +8 -6
- package/lib/sqs/SqsLambda.js +7 -1
- package/lib/sqs/SqsLambdaServices.d.ts +1 -0
- package/lib/sqs/SqsLambdaServices.js +1 -0
- package/package.json +2 -2
package/lib/http/HttpLambda.js
CHANGED
|
@@ -110,6 +110,7 @@ let HttpLambdaFactory = class HttpLambdaFactory {
|
|
|
110
110
|
const injectContextualServices = (0, containr_1.createServiceModule)('injectContextualServices', (services) => {
|
|
111
111
|
services.singleton(HttpLambdaServices_1.HttpLambdaServices.CurrentRoute, route);
|
|
112
112
|
services.singleton(HttpLambdaServices_1.HttpLambdaServices.CurrentEvent, request.event);
|
|
113
|
+
services.singleton(HttpLambdaServices_1.HttpLambdaServices.CurrentContext, request.context);
|
|
113
114
|
services.factory(HttpLambdaServices_1.HttpLambdaServices.RequestContext, (current) => {
|
|
114
115
|
return {
|
|
115
116
|
container: current,
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.HttpLambdaServices = void 0;
|
|
4
4
|
exports.HttpLambdaServices = {
|
|
5
|
-
|
|
5
|
+
CurrentContext: 'currentContext',
|
|
6
6
|
CurrentEvent: 'currentEvent',
|
|
7
|
+
CurrentRoute: 'currentRoute',
|
|
7
8
|
HttpLambdaFactory: 'HttpLambdaFactory',
|
|
8
9
|
HttpResponseGenerator: 'HttpResponseGenerator',
|
|
9
10
|
RequestContext: 'requestContext',
|
|
@@ -1,15 +1,17 @@
|
|
|
1
|
-
import { MessageBodyAttributeMap, SendMessageResult } from 'aws-sdk/clients/sqs';
|
|
2
|
-
import {
|
|
1
|
+
import { MessageBodyAttributeMap, SendMessageRequest, SendMessageResult } from 'aws-sdk/clients/sqs';
|
|
2
|
+
import { ISqsPublisher } from './SqsPublisher';
|
|
3
3
|
import { SQSMessageAttributes } from 'aws-lambda';
|
|
4
4
|
import { ISqsMessage } from './ISqsMessage';
|
|
5
5
|
import { LoggingLevel } from '../logging';
|
|
6
|
+
declare type ConfigureSqsDelegate = (params: SendMessageRequest) => Promise<void>;
|
|
6
7
|
export interface IMessagePublisher {
|
|
7
|
-
publish(event: ISqsMessage): Promise<SendMessageResult>;
|
|
8
|
+
publish(event: ISqsMessage, defaultAttributes?: SQSMessageAttributes, configure?: ConfigureSqsDelegate): Promise<SendMessageResult>;
|
|
8
9
|
}
|
|
9
10
|
export declare class MessagePublisher implements IMessagePublisher {
|
|
10
11
|
private readonly sqsPublisher;
|
|
11
12
|
private readonly levels;
|
|
12
|
-
constructor(sqsPublisher:
|
|
13
|
-
publish(sqsMessage: ISqsMessage): Promise<SendMessageResult>;
|
|
13
|
+
constructor(sqsPublisher: ISqsPublisher, levels: LoggingLevel);
|
|
14
|
+
publish(sqsMessage: ISqsMessage, defaultAttributes?: SQSMessageAttributes, configure?: ConfigureSqsDelegate): Promise<SendMessageResult>;
|
|
14
15
|
}
|
|
15
16
|
export declare function messageTypeConverter(attributes: SQSMessageAttributes): MessageBodyAttributeMap;
|
|
17
|
+
export {};
|
|
@@ -23,7 +23,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
23
23
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
24
|
exports.messageTypeConverter = exports.MessagePublisher = void 0;
|
|
25
25
|
const containr_1 = require("@aesop-fables/containr");
|
|
26
|
-
const SqsPublisher_1 = require("./SqsPublisher");
|
|
27
26
|
const SqsLambdaServices_1 = require("./SqsLambdaServices");
|
|
28
27
|
const logging_1 = require("../logging");
|
|
29
28
|
const TrigintaHeaders_1 = require("../TrigintaHeaders");
|
|
@@ -33,9 +32,9 @@ let MessagePublisher = class MessagePublisher {
|
|
|
33
32
|
this.sqsPublisher = sqsPublisher;
|
|
34
33
|
this.levels = levels;
|
|
35
34
|
}
|
|
36
|
-
publish(sqsMessage) {
|
|
35
|
+
publish(sqsMessage, defaultAttributes, configure) {
|
|
37
36
|
return __awaiter(this, void 0, void 0, function* () {
|
|
38
|
-
const attributes = Object.assign({}, messageTypeConverter(sqsMessage.getAttributes()));
|
|
37
|
+
const attributes = Object.assign(Object.assign({}, messageTypeConverter(defaultAttributes !== null && defaultAttributes !== void 0 ? defaultAttributes : {})), messageTypeConverter(sqsMessage.getAttributes()));
|
|
39
38
|
const level = this.levels.resolveLevel();
|
|
40
39
|
if (level) {
|
|
41
40
|
attributes[TrigintaHeaders_1.TrigintaHeaders.LogLevel] = {
|
|
@@ -43,19 +42,22 @@ let MessagePublisher = class MessagePublisher {
|
|
|
43
42
|
StringValue: level,
|
|
44
43
|
};
|
|
45
44
|
}
|
|
46
|
-
const
|
|
45
|
+
const params = {
|
|
47
46
|
MessageAttributes: attributes,
|
|
48
47
|
MessageBody: sqsMessage.getBody(),
|
|
49
48
|
QueueUrl: sqsMessage.getQueueUrl(),
|
|
50
49
|
};
|
|
51
|
-
|
|
50
|
+
if (typeof configure === 'function') {
|
|
51
|
+
yield configure(params);
|
|
52
|
+
}
|
|
53
|
+
return this.sqsPublisher.sendMessage(params);
|
|
52
54
|
});
|
|
53
55
|
}
|
|
54
56
|
};
|
|
55
57
|
MessagePublisher = __decorate([
|
|
56
58
|
__param(0, (0, containr_1.inject)(SqsLambdaServices_1.SqsLambdaServices.SqsPublisher)),
|
|
57
59
|
__param(1, (0, containr_1.inject)(logging_1.LoggingServices.Levels)),
|
|
58
|
-
__metadata("design:paramtypes", [
|
|
60
|
+
__metadata("design:paramtypes", [Object, Object])
|
|
59
61
|
], MessagePublisher);
|
|
60
62
|
exports.MessagePublisher = MessagePublisher;
|
|
61
63
|
function messageTypeConverter(attributes) {
|
package/lib/sqs/SqsLambda.js
CHANGED
|
@@ -46,17 +46,23 @@ function embedSqsRecord(record) {
|
|
|
46
46
|
services.singleton(SqsLambdaServices_1.SqsLambdaServices.CurrentRecord, record);
|
|
47
47
|
});
|
|
48
48
|
}
|
|
49
|
+
function embedSqsContext(context) {
|
|
50
|
+
return (0, containr_1.createServiceModule)('@aesop-fables/triginta/sqs/context', (services) => {
|
|
51
|
+
services.singleton(SqsLambdaServices_1.SqsLambdaServices.CurrentContext, context);
|
|
52
|
+
});
|
|
53
|
+
}
|
|
49
54
|
let SqsLambdaFactory = class SqsLambdaFactory {
|
|
50
55
|
constructor(container) {
|
|
51
56
|
this.container = container;
|
|
52
57
|
}
|
|
53
58
|
createHandler(newable) {
|
|
54
|
-
const handler = (event) => __awaiter(this, void 0, void 0, function* () {
|
|
59
|
+
const handler = (event, context) => __awaiter(this, void 0, void 0, function* () {
|
|
55
60
|
for (let i = 0; i < event.Records.length; i++) {
|
|
56
61
|
const record = event.Records[i];
|
|
57
62
|
const childContainer = this.container.createChildContainer('sqsLambda', [
|
|
58
63
|
embedSqsEvent(event),
|
|
59
64
|
embedSqsRecord(record),
|
|
65
|
+
embedSqsContext(context),
|
|
60
66
|
]);
|
|
61
67
|
try {
|
|
62
68
|
const handler = childContainer.resolve(newable);
|
|
@@ -11,6 +11,7 @@ exports.SqsLambdaServices = {
|
|
|
11
11
|
MessagePublisher: namedService('MessagePublisher'),
|
|
12
12
|
SqsPublisher: namedService('SqsPublisher'),
|
|
13
13
|
SqsSettings: namedService('SqsSettings'),
|
|
14
|
+
CurrentContext: namedService('SqsCurrentContext'),
|
|
14
15
|
CurrentEvent: namedService('SqsCurrentEvent'),
|
|
15
16
|
CurrentRecord: namedService('SqsCurrentRecord'),
|
|
16
17
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aesop-fables/triginta",
|
|
3
|
-
"version": "0.8.
|
|
3
|
+
"version": "0.8.6",
|
|
4
4
|
"description": "A lightweight framework that wraps the basic infrastructure usages of AWS Lambda (SQS, Kinesis, etc.).",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"exports": {
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"esbuild": "^0.17.8",
|
|
40
40
|
"eslint": "8.42.0",
|
|
41
41
|
"eslint-config-prettier": "^8.5.0",
|
|
42
|
-
"eslint-plugin-jest": "27.2.
|
|
42
|
+
"eslint-plugin-jest": "27.2.2",
|
|
43
43
|
"eslint-plugin-prettier": "^4.2.1",
|
|
44
44
|
"jest": "29.5.0",
|
|
45
45
|
"jest-mock-extended": "^3.0.1",
|