@comicrelief/lambda-wrapper 2.0.0 → 2.0.1
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/dist/models/SQSMessageModel.d.ts +2 -2
- package/dist/models/SQSMessageModel.d.ts.map +1 -1
- package/dist/models/SQSMessageModel.js.map +1 -1
- package/dist/services/BaseConfigService.d.ts +4 -4
- package/dist/services/BaseConfigService.d.ts.map +1 -1
- package/dist/services/BaseConfigService.js +6 -6
- package/dist/services/BaseConfigService.js.map +1 -1
- package/dist/services/SQSService.d.ts +5 -4
- package/dist/services/SQSService.d.ts.map +1 -1
- package/dist/services/SQSService.js +48 -36
- package/dist/services/SQSService.js.map +1 -1
- package/package.json +5 -5
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { Message } from '@aws-sdk/client-sqs';
|
|
2
2
|
/**
|
|
3
3
|
* Model for message received from SQS.
|
|
4
4
|
*
|
|
@@ -18,7 +18,7 @@ export default class SQSMessageModel {
|
|
|
18
18
|
readonly body: unknown;
|
|
19
19
|
readonly metadata: Record<string, any>;
|
|
20
20
|
forDeletion: boolean;
|
|
21
|
-
constructor(message:
|
|
21
|
+
constructor(message: Message);
|
|
22
22
|
/**
|
|
23
23
|
* Get message ID.
|
|
24
24
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQSMessageModel.d.ts","sourceRoot":"","sources":["../../src/models/SQSMessageModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"SQSMessageModel.d.ts","sourceRoot":"","sources":["../../src/models/SQSMessageModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAE/B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAEvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAE5C,WAAW,UAAS;gBAER,OAAO,EAAE,OAAO;IAqB5B;;OAEG;IACH,YAAY,IAAI,MAAM;IAItB;;OAEG;IACH,gBAAgB,IAAI,MAAM;IAI1B;;OAEG;IACH,OAAO,IAAI,OAAO;IAIlB;;;;OAIG;IACH,cAAc,CAAC,WAAW,EAAE,OAAO,GAAG,IAAI;IAI1C;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;OAEG;IACH,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAIlC;;;;;OAKG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;CAK3C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQSMessageModel.js","sourceRoot":"","sources":["../../src/models/SQSMessageModel.ts"],"names":[],"mappings":";;AAEA;;;;;;;;;;;;GAYG;AACH,MAAqB,eAAe;IAWlC,YAAY,
|
|
1
|
+
{"version":3,"file":"SQSMessageModel.js","sourceRoot":"","sources":["../../src/models/SQSMessageModel.ts"],"names":[],"mappings":";;AAEA;;;;;;;;;;;;GAYG;AACH,MAAqB,eAAe;IAWlC,YAAY,OAAgB;QAJnB,aAAQ,GAAwB,EAAE,CAAC;QAE5C,gBAAW,GAAG,KAAK,CAAC;QAGlB,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YACtB,MAAM,IAAI,SAAS,CAAC,mCAAmC,CAAC,CAAC;SAC1D;QACD,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;YAC1B,MAAM,IAAI,SAAS,CAAC,uCAAuC,CAAC,CAAC;SAC9D;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACjB,MAAM,IAAI,SAAS,CAAC,8BAA8B,CAAC,CAAC;SACrD;QAED,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAE3C,IAAI;YACF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACtC;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,SAAS,CAAC,gCAAgC,CAAC,CAAC;SACvD;IACH,CAAC;IAED;;OAEG;IACH,YAAY;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,gBAAgB;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED;;OAEG;IACH,OAAO;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,cAAc,CAAC,WAAoB;QACjC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,aAAa;QACX,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,WAAW;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED;;;;;OAKG;IACH,WAAW,CAAC,GAAW,EAAE,KAAU;QACjC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAE3B,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAvFD,kCAuFC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { S3Client } from '@aws-sdk/client-s3';
|
|
2
2
|
import DependencyAwareClass from '../core/DependencyAwareClass';
|
|
3
3
|
/**
|
|
4
4
|
* `error.code` for S3 404 errors.
|
|
@@ -49,15 +49,15 @@ export default class BaseConfigService extends DependencyAwareClass {
|
|
|
49
49
|
/**
|
|
50
50
|
* Returns an S3 client.
|
|
51
51
|
*/
|
|
52
|
-
static get client():
|
|
52
|
+
static get client(): S3Client;
|
|
53
53
|
/**
|
|
54
54
|
* Returns an S3 client
|
|
55
55
|
*/
|
|
56
|
-
get client():
|
|
56
|
+
get client(): S3Client;
|
|
57
57
|
/**
|
|
58
58
|
* Deletes the configuration stored on S3. Helpful in feature tests.
|
|
59
59
|
*/
|
|
60
|
-
delete(): Promise<import("aws-sdk/
|
|
60
|
+
delete(): Promise<import("@aws-sdk/client-s3").DeleteObjectCommandOutput>;
|
|
61
61
|
/**
|
|
62
62
|
* Puts the given configuration on S3.
|
|
63
63
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseConfigService.d.ts","sourceRoot":"","sources":["../../src/services/BaseConfigService.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"BaseConfigService.d.ts","sourceRoot":"","sources":["../../src/services/BaseConfigService.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,QAAQ,EACT,MAAM,oBAAoB,CAAC;AAE5B,OAAO,oBAAoB,MAAM,8BAA8B,CAAC;AAGhE;;GAEG;AACH,eAAO,MAAM,yBAAyB,cAAc,CAAC;AAErD;;GAEG;AACH,eAAO,MAAM,aAAa;;;;CAIzB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB;;CAIlC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,oBAAoB;IACjE;;;;;;;OAOG;IACH,MAAM,KAAK,aAAa;;MAIvB;IAED;;;OAGG;IACH,MAAM,KAAK,QAAQ,IAAI;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;KAAE,CAKtD;IAED;;OAEG;IACH,MAAM,KAAK,MAAM,aAIhB;IAED;;OAEG;IACH,IAAI,MAAM,aAET;IAED;;OAEG;IACG,MAAM;IAMZ;;;;OAIG;IACG,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IASnC;;OAEG;IACG,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC;IAkB7B;;;;;OAKG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAarC;;;;;;OAMG;IACG,KAAK,CAAC,aAAa,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAqBjD;;;;;;OAMG;IACG,WAAW,CAAC,aAAa,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAMvD;;;;OAIG;IACG,aAAa,CAAC,aAAa,GAAE,GAAU;CAW9C"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.ServiceStatesHttpCodes = exports.ServiceStates = exports.S3_NO_SUCH_KEY_ERROR_CODE = void 0;
|
|
7
|
-
const
|
|
7
|
+
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
8
8
|
const DependencyAwareClass_1 = __importDefault(require("../core/DependencyAwareClass"));
|
|
9
9
|
const LambdaTermination_1 = __importDefault(require("../utils/LambdaTermination"));
|
|
10
10
|
/**
|
|
@@ -63,7 +63,7 @@ class BaseConfigService extends DependencyAwareClass_1.default {
|
|
|
63
63
|
* Returns an S3 client.
|
|
64
64
|
*/
|
|
65
65
|
static get client() {
|
|
66
|
-
return new
|
|
66
|
+
return new client_s3_1.S3Client({
|
|
67
67
|
region: process.env.REGION,
|
|
68
68
|
});
|
|
69
69
|
}
|
|
@@ -77,7 +77,7 @@ class BaseConfigService extends DependencyAwareClass_1.default {
|
|
|
77
77
|
* Deletes the configuration stored on S3. Helpful in feature tests.
|
|
78
78
|
*/
|
|
79
79
|
async delete() {
|
|
80
|
-
return this.client.
|
|
80
|
+
return this.client.send(new client_s3_1.DeleteObjectCommand(this.constructor.s3config));
|
|
81
81
|
}
|
|
82
82
|
/**
|
|
83
83
|
* Puts the given configuration on S3.
|
|
@@ -85,17 +85,17 @@ class BaseConfigService extends DependencyAwareClass_1.default {
|
|
|
85
85
|
* @param config
|
|
86
86
|
*/
|
|
87
87
|
async put(config) {
|
|
88
|
-
await this.client.
|
|
88
|
+
await this.client.send(new client_s3_1.PutObjectCommand({
|
|
89
89
|
...this.constructor.s3config,
|
|
90
90
|
Body: JSON.stringify(config),
|
|
91
|
-
})
|
|
91
|
+
}));
|
|
92
92
|
return config;
|
|
93
93
|
}
|
|
94
94
|
/**
|
|
95
95
|
* Gets the service configuration.
|
|
96
96
|
*/
|
|
97
97
|
async get() {
|
|
98
|
-
const response = await this.client.
|
|
98
|
+
const response = await this.client.send(new client_s3_1.GetObjectCommand(this.constructor.s3config));
|
|
99
99
|
const body = String(response.Body);
|
|
100
100
|
if (!body) {
|
|
101
101
|
// Empty strings are not valid configurations
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseConfigService.js","sourceRoot":"","sources":["../../src/services/BaseConfigService.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"BaseConfigService.js","sourceRoot":"","sources":["../../src/services/BaseConfigService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { LambdaClient } from '@aws-sdk/client-lambda';
|
|
2
|
+
import { SQSClient, SendMessageCommandInput } from '@aws-sdk/client-sqs';
|
|
2
3
|
import DependencyAwareClass from '../core/DependencyAwareClass';
|
|
3
4
|
import DependencyInjection from '../core/DependencyInjection';
|
|
4
5
|
import { LambdaWrapperConfig } from '../core/config';
|
|
@@ -197,11 +198,11 @@ export default class SQSService<TConfig extends LambdaWrapperConfig & WithSQSSer
|
|
|
197
198
|
/**
|
|
198
199
|
* Returns an SQS client instance
|
|
199
200
|
*/
|
|
200
|
-
get sqs():
|
|
201
|
+
get sqs(): SQSClient;
|
|
201
202
|
/**
|
|
202
203
|
* Returns a Lambda client instance
|
|
203
204
|
*/
|
|
204
|
-
get lambda():
|
|
205
|
+
get lambda(): LambdaClient;
|
|
205
206
|
/**
|
|
206
207
|
* Returns the mode to use for offline SQS.
|
|
207
208
|
*
|
|
@@ -252,7 +253,7 @@ export default class SQSService<TConfig extends LambdaWrapperConfig & WithSQSSer
|
|
|
252
253
|
* @param queue
|
|
253
254
|
* @param messageParameters
|
|
254
255
|
*/
|
|
255
|
-
publishOffline(queue: QueueName<TConfig>, messageParameters:
|
|
256
|
+
publishOffline(queue: QueueName<TConfig>, messageParameters: SendMessageCommandInput): Promise<void>;
|
|
256
257
|
/**
|
|
257
258
|
* Receive from message queue
|
|
258
259
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQSService.d.ts","sourceRoot":"","sources":["../../src/services/SQSService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SQSService.d.ts","sourceRoot":"","sources":["../../src/services/SQSService.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.SQS_PUBLISH_FAILURE_MODES = exports.SQS_OFFLINE_MODES = void 0;
|
|
7
|
+
const client_lambda_1 = require("@aws-sdk/client-lambda");
|
|
8
|
+
const client_sqs_1 = require("@aws-sdk/client-sqs");
|
|
9
|
+
const node_http_handler_1 = require("@smithy/node-http-handler");
|
|
7
10
|
const alai_1 = __importDefault(require("alai"));
|
|
8
11
|
const async_1 = require("async");
|
|
9
|
-
const aws_sdk_1 = __importDefault(require("aws-sdk"));
|
|
10
12
|
const uuid_1 = require("uuid");
|
|
11
13
|
const DependencyAwareClass_1 = __importDefault(require("../core/DependencyAwareClass"));
|
|
12
14
|
const SQSMessageModel_1 = __importDefault(require("../models/SQSMessageModel"));
|
|
@@ -168,14 +170,14 @@ class SQSService extends DependencyAwareClass_1.default {
|
|
|
168
170
|
*/
|
|
169
171
|
get sqs() {
|
|
170
172
|
if (!this.$sqs) {
|
|
171
|
-
this.$sqs = new
|
|
173
|
+
this.$sqs = new client_sqs_1.SQSClient({
|
|
172
174
|
region: process.env.REGION,
|
|
173
|
-
|
|
175
|
+
requestHandler: new node_http_handler_1.NodeHttpHandler({
|
|
174
176
|
// longest publish on NOTV took 5 seconds
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
},
|
|
178
|
-
|
|
177
|
+
connectionTimeout: 8 * 1000,
|
|
178
|
+
socketTimeout: 8 * 1000,
|
|
179
|
+
}),
|
|
180
|
+
maxAttempts: 4, // default from AWS SDK v2 was 3 retries for SQS
|
|
179
181
|
});
|
|
180
182
|
}
|
|
181
183
|
return this.$sqs;
|
|
@@ -190,7 +192,7 @@ class SQSService extends DependencyAwareClass_1.default {
|
|
|
190
192
|
throw new Error('process.env.SERVICE_LAMBDA_URL must be defined.');
|
|
191
193
|
}
|
|
192
194
|
// move to subprocess
|
|
193
|
-
this.$lambda = new
|
|
195
|
+
this.$lambda = new client_lambda_1.LambdaClient({
|
|
194
196
|
region: process.env.AWS_REGION,
|
|
195
197
|
endpoint,
|
|
196
198
|
});
|
|
@@ -234,14 +236,14 @@ class SQSService extends DependencyAwareClass_1.default {
|
|
|
234
236
|
logger.error(loopError);
|
|
235
237
|
resolve();
|
|
236
238
|
}
|
|
237
|
-
this.sqs.
|
|
239
|
+
this.sqs.send(new client_sqs_1.DeleteMessageBatchCommand({
|
|
238
240
|
Entries: messagesForDeletion,
|
|
239
241
|
QueueUrl: queueUrl,
|
|
240
|
-
}
|
|
242
|
+
})).finally(() => {
|
|
241
243
|
timer.stop(timerId);
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
244
|
+
}).catch((error) => {
|
|
245
|
+
logger.error(error);
|
|
246
|
+
}).then(() => {
|
|
245
247
|
resolve();
|
|
246
248
|
});
|
|
247
249
|
});
|
|
@@ -256,16 +258,21 @@ class SQSService extends DependencyAwareClass_1.default {
|
|
|
256
258
|
const timerId = `sqs-list-queues-${(0, uuid_1.v4)()}`;
|
|
257
259
|
return new Promise((resolve) => {
|
|
258
260
|
timer.start(timerId);
|
|
259
|
-
|
|
261
|
+
let status = 'OK';
|
|
262
|
+
this.sqs.send(new client_sqs_1.ListQueuesCommand())
|
|
263
|
+
.finally(() => {
|
|
260
264
|
timer.stop(timerId);
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
logger.error(error);
|
|
264
|
-
status = 'APPLICATION_FAILURE';
|
|
265
|
-
}
|
|
265
|
+
})
|
|
266
|
+
.then((data) => {
|
|
266
267
|
if (typeof data.QueueUrls === 'undefined' || data.QueueUrls.length === 0) {
|
|
267
268
|
status = 'APPLICATION_FAILURE';
|
|
268
269
|
}
|
|
270
|
+
})
|
|
271
|
+
.catch((error) => {
|
|
272
|
+
logger.error(error);
|
|
273
|
+
status = 'APPLICATION_FAILURE';
|
|
274
|
+
})
|
|
275
|
+
.then(() => {
|
|
269
276
|
resolve({
|
|
270
277
|
service: 'SQS',
|
|
271
278
|
status,
|
|
@@ -285,17 +292,17 @@ class SQSService extends DependencyAwareClass_1.default {
|
|
|
285
292
|
const timerId = `sqs-get-queue-attributes-${(0, uuid_1.v4)()} - Queue: '${queueUrl}'`;
|
|
286
293
|
return new Promise((resolve) => {
|
|
287
294
|
timer.start(timerId);
|
|
288
|
-
this.sqs.
|
|
295
|
+
this.sqs.send(new client_sqs_1.GetQueueAttributesCommand({
|
|
289
296
|
AttributeNames: ['ApproximateNumberOfMessages'],
|
|
290
297
|
QueueUrl: queueUrl,
|
|
291
|
-
}
|
|
298
|
+
})).finally(() => {
|
|
292
299
|
timer.stop(timerId);
|
|
293
|
-
|
|
294
|
-
logger.error(error);
|
|
295
|
-
resolve(0);
|
|
296
|
-
}
|
|
300
|
+
}).then((data) => {
|
|
297
301
|
const messageCount = data.Attributes?.ApproximateNumberOfMessages || '0';
|
|
298
302
|
resolve(Number.parseInt(messageCount, 10));
|
|
303
|
+
}).catch((error) => {
|
|
304
|
+
logger.error(error);
|
|
305
|
+
resolve(0);
|
|
299
306
|
});
|
|
300
307
|
});
|
|
301
308
|
}
|
|
@@ -335,7 +342,7 @@ class SQSService extends DependencyAwareClass_1.default {
|
|
|
335
342
|
await this.publishOffline(queue, messageParameters);
|
|
336
343
|
}
|
|
337
344
|
else {
|
|
338
|
-
await this.sqs.
|
|
345
|
+
await this.sqs.send(new client_sqs_1.SendMessageCommand(messageParameters));
|
|
339
346
|
}
|
|
340
347
|
}
|
|
341
348
|
catch (error) {
|
|
@@ -374,8 +381,11 @@ class SQSService extends DependencyAwareClass_1.default {
|
|
|
374
381
|
},
|
|
375
382
|
],
|
|
376
383
|
});
|
|
377
|
-
|
|
378
|
-
|
|
384
|
+
await this.lambda.send(new client_lambda_1.InvokeCommand({
|
|
385
|
+
FunctionName,
|
|
386
|
+
InvocationType,
|
|
387
|
+
Payload,
|
|
388
|
+
}));
|
|
379
389
|
}
|
|
380
390
|
/**
|
|
381
391
|
* Receive from message queue
|
|
@@ -390,20 +400,22 @@ class SQSService extends DependencyAwareClass_1.default {
|
|
|
390
400
|
const timerId = `sqs-receive-message-${(0, uuid_1.v4)()} - Queue: '${queueUrl}'`;
|
|
391
401
|
return new Promise((resolve, reject) => {
|
|
392
402
|
timer.start(timerId);
|
|
393
|
-
this.sqs.
|
|
403
|
+
this.sqs.send(new client_sqs_1.ReceiveMessageCommand({
|
|
394
404
|
QueueUrl: queueUrl,
|
|
395
405
|
VisibilityTimeout: timeout,
|
|
396
406
|
MaxNumberOfMessages: 10,
|
|
397
|
-
}
|
|
407
|
+
})).finally(() => {
|
|
398
408
|
timer.stop(timerId);
|
|
399
|
-
|
|
400
|
-
logger.error(error);
|
|
401
|
-
return reject(error);
|
|
402
|
-
}
|
|
409
|
+
}).then((data) => {
|
|
403
410
|
if (typeof data.Messages === 'undefined') {
|
|
404
|
-
|
|
411
|
+
resolve([]);
|
|
412
|
+
}
|
|
413
|
+
else {
|
|
414
|
+
resolve(data.Messages.map((message) => new SQSMessageModel_1.default(message)));
|
|
405
415
|
}
|
|
406
|
-
|
|
416
|
+
}).catch((error) => {
|
|
417
|
+
logger.error(error);
|
|
418
|
+
reject(error);
|
|
407
419
|
});
|
|
408
420
|
});
|
|
409
421
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQSService.js","sourceRoot":"","sources":["../../src/services/SQSService.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,iCAA6B;AAC7B
|
|
1
|
+
{"version":3,"file":"SQSService.js","sourceRoot":"","sources":["../../src/services/SQSService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@comicrelief/lambda-wrapper",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.1",
|
|
4
4
|
"description": "Lambda wrapper for all Comic Relief Serverless Projects",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"author": "Adam Clark",
|
|
@@ -32,7 +32,6 @@
|
|
|
32
32
|
"@types/xml2js": "^0.4.14",
|
|
33
33
|
"@typescript-eslint/eslint-plugin": "^5.33.0",
|
|
34
34
|
"@typescript-eslint/parser": "^5.33.0",
|
|
35
|
-
"aws-sdk": "^2.1568.0",
|
|
36
35
|
"eslint": "^8.57.0",
|
|
37
36
|
"eslint-plugin-import": "^2.25.2",
|
|
38
37
|
"eslint-plugin-jsdoc": "^39.3.2",
|
|
@@ -45,12 +44,13 @@
|
|
|
45
44
|
"tsconfig-paths": "^4.2.0",
|
|
46
45
|
"typescript": "^4.9.5"
|
|
47
46
|
},
|
|
48
|
-
"peerDependencies": {
|
|
49
|
-
"aws-sdk": "^2.831.0"
|
|
50
|
-
},
|
|
51
47
|
"dependencies": {
|
|
48
|
+
"@aws-sdk/client-lambda": "^3.540.0",
|
|
49
|
+
"@aws-sdk/client-s3": "^3.540.0",
|
|
50
|
+
"@aws-sdk/client-sqs": "^3.540.0",
|
|
52
51
|
"@lumigo/tracer": "^1.91.0",
|
|
53
52
|
"@sentry/node": "^6.19.7",
|
|
53
|
+
"@smithy/node-http-handler": "^2.5.0",
|
|
54
54
|
"@types/aws-lambda": "^8.10.134",
|
|
55
55
|
"alai": "1.0.3",
|
|
56
56
|
"async": "^3.2.5",
|