@comicrelief/lambda-wrapper 2.0.2 → 2.0.3
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/services/RequestService.d.ts.map +1 -1
- package/dist/services/RequestService.js +8 -12
- package/dist/services/RequestService.js.map +1 -1
- package/dist/services/SQSService.d.ts.map +1 -1
- package/dist/services/SQSService.js +72 -86
- package/dist/services/SQSService.js.map +1 -1
- package/package.json +1 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestService.d.ts","sourceRoot":"","sources":["../../src/services/RequestService.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAKlD,OAAO,oBAAoB,MAAM,8BAA8B,CAAC;AAChE,OAAO,aAAa,MAAM,yBAAyB,CAAC;AAGpD,eAAO,MAAM,aAAa;;;;;;;;CAQzB,CAAC;AAEF,eAAO,MAAM,6BAA6B,UAKzC,CAAC;AAEF,eAAO,MAAM,0BAA0B,UAItC,CAAC;AAGF,eAAO,MAAM,WAAW;;CAEvB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,oBAAoB;IAC9D;;;;;;OAMG;IACH,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAU9F;;;;;;OAMG;IACH,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAWnD;;;;;;;;OAQG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,SAAK,GAAG,MAAM;IAMjD;;OAEG;IACH,qBAAqB,IAAI,MAAM,GAAG,IAAI;IAgBtC;;;;;OAKG;IACH,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,KAAK,GAAG,GAAG;IAqBtD;;;;OAIG;IACH,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,GAAG;IAyDjC;;OAEG;IACH,KAAK,IAAI,MAAM,GAAG,IAAI;IActB;;OAEG;IACH,uBAAuB;;;;;;;IAuBvB;;;;;;OAMG;IACH,0BAA0B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"RequestService.d.ts","sourceRoot":"","sources":["../../src/services/RequestService.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAKlD,OAAO,oBAAoB,MAAM,8BAA8B,CAAC;AAChE,OAAO,aAAa,MAAM,yBAAyB,CAAC;AAGpD,eAAO,MAAM,aAAa;;;;;;;;CAQzB,CAAC;AAEF,eAAO,MAAM,6BAA6B,UAKzC,CAAC;AAEF,eAAO,MAAM,0BAA0B,UAItC,CAAC;AAGF,eAAO,MAAM,WAAW;;CAEvB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,oBAAoB;IAC9D;;;;;;OAMG;IACH,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAU9F;;;;;;OAMG;IACH,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAWnD;;;;;;;;OAQG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,SAAK,GAAG,MAAM;IAMjD;;OAEG;IACH,qBAAqB,IAAI,MAAM,GAAG,IAAI;IAgBtC;;;;;OAKG;IACH,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,KAAK,GAAG,GAAG;IAqBtD;;;;OAIG;IACH,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,GAAG;IAyDjC;;OAEG;IACH,KAAK,IAAI,MAAM,GAAG,IAAI;IActB;;OAEG;IACH,uBAAuB;;;;;;;IAuBvB;;;;;;OAMG;IACH,0BAA0B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAc9D;;;;OAIG;IACH,SAAS,CAAC,SAAS,EAAE,OAAO;IAiC5B;;OAEG;IACH,aAAa;IAUb;;;;;OAKG;IACH,MAAM,CAAC,uBAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAM3G;;;;;OAKG;IACH,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,MAAM,GAAG,SAAS;CAGpE"}
|
|
@@ -213,18 +213,14 @@ class RequestService extends DependencyAwareClass_1.default {
|
|
|
213
213
|
*/
|
|
214
214
|
validateAgainstConstraints(constraints) {
|
|
215
215
|
const logger = this.di.get(LoggerService_1.default);
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
validationErrorResponse.setBodyVariable('validation_errors', validation);
|
|
225
|
-
reject(validationErrorResponse);
|
|
226
|
-
}
|
|
227
|
-
});
|
|
216
|
+
const validation = (0, validate_1.default)(this.getAll(), constraints);
|
|
217
|
+
if (typeof validation === 'undefined') {
|
|
218
|
+
return Promise.resolve();
|
|
219
|
+
}
|
|
220
|
+
logger.label('request-validation-failed');
|
|
221
|
+
const validationErrorResponse = exports.ERROR_TYPES.VALIDATION_ERROR;
|
|
222
|
+
validationErrorResponse.setBodyVariable('validation_errors', validation);
|
|
223
|
+
return Promise.reject(validationErrorResponse);
|
|
228
224
|
}
|
|
229
225
|
/**
|
|
230
226
|
* Fetch the request multipart form.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestService.js","sourceRoot":"","sources":["../../src/services/RequestService.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAsC;AAGtC,0DAAkC;AAClC,oEAA4C;AAC5C,oDAA4B;AAE5B,wFAAgE;AAChE,4EAAoD;AACpD,oEAA4C;AAE/B,QAAA,aAAa,GAAG;IAC3B,MAAM,EAAE,QAAQ;IAChB,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,KAAK;CACX,CAAC;AAEW,QAAA,6BAA6B,GAAG;IAC3C,qBAAa,CAAC,MAAM;IACpB,qBAAa,CAAC,GAAG;IACjB,qBAAa,CAAC,IAAI;IAClB,qBAAa,CAAC,OAAO;CACtB,CAAC;AAEW,QAAA,0BAA0B,GAAG;IACxC,qBAAa,CAAC,KAAK;IACnB,qBAAa,CAAC,IAAI;IAClB,qBAAa,CAAC,GAAG;CAClB,CAAC;AAEF,qCAAqC;AACxB,QAAA,WAAW,GAAG;IACzB,gBAAgB,EAAE,IAAI,uBAAa,CAAC,EAAE,EAAE,GAAG,EAAE,6BAA6B,CAAC;CAC5E,CAAC;AASF;;GAEG;AACH,MAAqB,cAAe,SAAQ,8BAAoB;IAC9D;;;;;;OAMG;IACH,GAAG,CAAC,SAAiB,EAAE,MAAsB,EAAE,WAAoB;QACjE,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAEjD,IAAI,eAAe,KAAK,IAAI,EAAE;YAC5B,OAAO,MAAM,IAAI,IAAI,CAAC;SACvB;QAED,OAAO,eAAe,CAAC,SAAS,CAAC,IAAI,MAAM,IAAI,IAAI,CAAC;IACtD,CAAC;IAED;;;;;;OAMG;IACH,aAAa;QACX,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,KAA6B,CAAC;QACpD,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;YAClB,OAAO,EAAE,CAAC;SACX;QACD,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;aAC1B,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,KAAK,CAAC,CAAC,CACrD,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,IAAY,EAAE,WAAW,GAAG,EAAE;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACrC,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACrC,OAAO,OAAO,CAAC,SAAS,CAAC,IAAI,WAAW,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,qBAAqB;QACnB,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QACtD,IAAI,CAAC,aAAa,EAAE;YAClB,OAAO,IAAI,CAAC;SACb;QAED,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAEjC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,QAAQ,IAAI,UAAU,CAAC,EAAE;YAC7D,OAAO,IAAI,CAAC;SACb;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,SAAkB,EAAE,MAAM,GAAG,EAAE;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,QAAQ,EAA0B,CAAC;QAErE,iEAAiE;QACjE,IAAI,CAAC,SAAS,IAAI,OAAO,KAAK,CAAC,cAAc,KAAK,QAAQ,EAAE;YAC1D,OAAO,KAAK,CAAC,cAAc,CAAC;SAC7B;QAED,+EAA+E;QAC/E,IACE,SAAS;eACN,OAAO,KAAK,CAAC,cAAc,KAAK,QAAQ;eACxC,KAAK,CAAC,cAAc,KAAK,IAAI;eAC7B,OAAO,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,WAAW,EACzD;YACA,OAAO,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;SACxC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,WAAoB;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,QAAQ,EAA0B,CAAC;QAErE,IACE,qCAA6B,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC;eACrD,qCAA6B,CAAC,QAAQ,CAAC,WAAW,IAAI,EAAE,CAAC,EAC5D;YACA,wBAAwB;YACxB,MAAM,MAAM,GAAkD;gBAC5D,GAAG,KAAK,CAAC,qBAAqB;aAC/B,CAAC;YACF,iCAAiC;YACjC,IAAI,KAAK,CAAC,+BAA+B,KAAK,IAAI,EAAE;gBAClD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;qBAChB,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;qBACnC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACf,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,+BAA+B,EAAE,CAAC,GAAG,CAAC,CAAC;gBAC7D,CAAC,CAAC,CAAC;aACN;YACD,OAAO,MAAM,CAAC;SACf;QAED,IACE,kCAA0B,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC;eAClD,kCAA0B,CAAC,QAAQ,CAAC,WAAW,IAAI,EAAE,CAAC,EACzD;YACA,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;YACnD,IAAI,eAAe,GAAG,EAAE,CAAC;YAEzB,IAAI,WAAW,CAAC,QAAQ,CAAC,mCAAmC,CAAC,EAAE;gBAC7D,eAAe,GAAG,qBAAW,CAAC,KAAK,CAAC,KAAK,CAAC,IAAc,CAAC,CAAC;aAC3D;YAED,IAAI,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;gBAC5C,IAAI;oBACF,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAc,CAAC,CAAC;iBACpD;gBAAC,MAAM;oBACN,eAAe,GAAG,EAAE,CAAC;iBACtB;aACF;YAED,IAAI,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBACpC,gBAAM,CAAC,WAAW,CAAC,KAAK,CAAC,IAAc,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;oBACzD,eAAe,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;gBACxC,CAAC,CAAC,CAAC;aACJ;YAED,IAAI,WAAW,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;gBAC/C,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;aACxC;YAED,OAAO,OAAO,eAAe,KAAK,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;SACtE;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,KAAK;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,CAAC;QAE7C,IACE,OAAO,KAAK,CAAC,cAAc,KAAK,WAAW;eACxC,OAAO,KAAK,CAAC,cAAc,CAAC,QAAQ,KAAK,WAAW;eACpD,OAAO,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,KAAK,WAAW,EAChE;YACA,OAAO,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC;SAC/C;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,uBAAuB;QACrB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC/C,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,IAAI,CAAC;SACb;QAED,IAAI;YACF,MAAM,KAAK,GAAG,mBAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACzC,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;YAE7B,OAAO;gBACL,cAAc,EAAE,KAAK,CAAC,MAAM;gBAC5B,iBAAiB,EAAE,KAAK,CAAC,SAAS,EAAE;gBACpC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM;gBAClC,kBAAkB,EAAE,EAAE,CAAC,MAAM;gBAC7B,0BAA0B,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE;aACjD,CAAC;SACH;QAAC,MAAM;YACN,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAa,CAAC,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC9D,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAED;;;;;;OAMG;IACH,0BAA0B,CAAC,WAAmB;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAa,CAAC,CAAC;QAE1C,
|
|
1
|
+
{"version":3,"file":"RequestService.js","sourceRoot":"","sources":["../../src/services/RequestService.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAsC;AAGtC,0DAAkC;AAClC,oEAA4C;AAC5C,oDAA4B;AAE5B,wFAAgE;AAChE,4EAAoD;AACpD,oEAA4C;AAE/B,QAAA,aAAa,GAAG;IAC3B,MAAM,EAAE,QAAQ;IAChB,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,KAAK;CACX,CAAC;AAEW,QAAA,6BAA6B,GAAG;IAC3C,qBAAa,CAAC,MAAM;IACpB,qBAAa,CAAC,GAAG;IACjB,qBAAa,CAAC,IAAI;IAClB,qBAAa,CAAC,OAAO;CACtB,CAAC;AAEW,QAAA,0BAA0B,GAAG;IACxC,qBAAa,CAAC,KAAK;IACnB,qBAAa,CAAC,IAAI;IAClB,qBAAa,CAAC,GAAG;CAClB,CAAC;AAEF,qCAAqC;AACxB,QAAA,WAAW,GAAG;IACzB,gBAAgB,EAAE,IAAI,uBAAa,CAAC,EAAE,EAAE,GAAG,EAAE,6BAA6B,CAAC;CAC5E,CAAC;AASF;;GAEG;AACH,MAAqB,cAAe,SAAQ,8BAAoB;IAC9D;;;;;;OAMG;IACH,GAAG,CAAC,SAAiB,EAAE,MAAsB,EAAE,WAAoB;QACjE,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAEjD,IAAI,eAAe,KAAK,IAAI,EAAE;YAC5B,OAAO,MAAM,IAAI,IAAI,CAAC;SACvB;QAED,OAAO,eAAe,CAAC,SAAS,CAAC,IAAI,MAAM,IAAI,IAAI,CAAC;IACtD,CAAC;IAED;;;;;;OAMG;IACH,aAAa;QACX,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,KAA6B,CAAC;QACpD,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;YAClB,OAAO,EAAE,CAAC;SACX;QACD,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;aAC1B,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,KAAK,CAAC,CAAC,CACrD,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,IAAY,EAAE,WAAW,GAAG,EAAE;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACrC,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACrC,OAAO,OAAO,CAAC,SAAS,CAAC,IAAI,WAAW,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,qBAAqB;QACnB,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QACtD,IAAI,CAAC,aAAa,EAAE;YAClB,OAAO,IAAI,CAAC;SACb;QAED,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAEjC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,QAAQ,IAAI,UAAU,CAAC,EAAE;YAC7D,OAAO,IAAI,CAAC;SACb;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,SAAkB,EAAE,MAAM,GAAG,EAAE;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,QAAQ,EAA0B,CAAC;QAErE,iEAAiE;QACjE,IAAI,CAAC,SAAS,IAAI,OAAO,KAAK,CAAC,cAAc,KAAK,QAAQ,EAAE;YAC1D,OAAO,KAAK,CAAC,cAAc,CAAC;SAC7B;QAED,+EAA+E;QAC/E,IACE,SAAS;eACN,OAAO,KAAK,CAAC,cAAc,KAAK,QAAQ;eACxC,KAAK,CAAC,cAAc,KAAK,IAAI;eAC7B,OAAO,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,WAAW,EACzD;YACA,OAAO,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;SACxC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,WAAoB;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,QAAQ,EAA0B,CAAC;QAErE,IACE,qCAA6B,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC;eACrD,qCAA6B,CAAC,QAAQ,CAAC,WAAW,IAAI,EAAE,CAAC,EAC5D;YACA,wBAAwB;YACxB,MAAM,MAAM,GAAkD;gBAC5D,GAAG,KAAK,CAAC,qBAAqB;aAC/B,CAAC;YACF,iCAAiC;YACjC,IAAI,KAAK,CAAC,+BAA+B,KAAK,IAAI,EAAE;gBAClD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;qBAChB,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;qBACnC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACf,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,+BAA+B,EAAE,CAAC,GAAG,CAAC,CAAC;gBAC7D,CAAC,CAAC,CAAC;aACN;YACD,OAAO,MAAM,CAAC;SACf;QAED,IACE,kCAA0B,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC;eAClD,kCAA0B,CAAC,QAAQ,CAAC,WAAW,IAAI,EAAE,CAAC,EACzD;YACA,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;YACnD,IAAI,eAAe,GAAG,EAAE,CAAC;YAEzB,IAAI,WAAW,CAAC,QAAQ,CAAC,mCAAmC,CAAC,EAAE;gBAC7D,eAAe,GAAG,qBAAW,CAAC,KAAK,CAAC,KAAK,CAAC,IAAc,CAAC,CAAC;aAC3D;YAED,IAAI,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;gBAC5C,IAAI;oBACF,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAc,CAAC,CAAC;iBACpD;gBAAC,MAAM;oBACN,eAAe,GAAG,EAAE,CAAC;iBACtB;aACF;YAED,IAAI,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBACpC,gBAAM,CAAC,WAAW,CAAC,KAAK,CAAC,IAAc,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;oBACzD,eAAe,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;gBACxC,CAAC,CAAC,CAAC;aACJ;YAED,IAAI,WAAW,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;gBAC/C,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;aACxC;YAED,OAAO,OAAO,eAAe,KAAK,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;SACtE;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,KAAK;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,CAAC;QAE7C,IACE,OAAO,KAAK,CAAC,cAAc,KAAK,WAAW;eACxC,OAAO,KAAK,CAAC,cAAc,CAAC,QAAQ,KAAK,WAAW;eACpD,OAAO,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,KAAK,WAAW,EAChE;YACA,OAAO,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC;SAC/C;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,uBAAuB;QACrB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC/C,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,IAAI,CAAC;SACb;QAED,IAAI;YACF,MAAM,KAAK,GAAG,mBAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACzC,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC;YAE7B,OAAO;gBACL,cAAc,EAAE,KAAK,CAAC,MAAM;gBAC5B,iBAAiB,EAAE,KAAK,CAAC,SAAS,EAAE;gBACpC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM;gBAClC,kBAAkB,EAAE,EAAE,CAAC,MAAM;gBAC7B,0BAA0B,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE;aACjD,CAAC;SACH;QAAC,MAAM;YACN,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAa,CAAC,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC9D,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAED;;;;;;OAMG;IACH,0BAA0B,CAAC,WAAmB;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAa,CAAC,CAAC;QAE1C,MAAM,UAAU,GAAG,IAAA,kBAAQ,EAAC,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,CAAC,CAAC;QACxD,IAAI,OAAO,UAAU,KAAK,WAAW,EAAE;YACrC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1B;QAED,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC1C,MAAM,uBAAuB,GAAG,mBAAW,CAAC,gBAAgB,CAAC;QAC7D,uBAAuB,CAAC,eAAe,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;QACzE,OAAO,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,SAAkB;QAC1B,uEAAuE;QACvE,6DAA6D;QAE7D,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,QAAQ,EAA0B,CAAC;QACrE,MAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,KAAK,CAAW,CAAC;QAE7D,MAAM,IAAI,GAAG,KAAK,CAAC,eAAe;YAChC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAc,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE;YACvE,CAAC,CAAC,KAAK,CAAC,IAAc,CAAC;QAEzB,MAAM,MAAM,GAAyC,EAAE,CAAC;QACxD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACpC,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBACxD,MAAM,CAAC,IAAI,CAAC,GAAG;oBACb,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;oBACxD,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC3D,OAAO,EAAE,SAAS;wBAChB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAE,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC;wBAC5H,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAE,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;iBACxG,CAAC;aACH;iBAAM,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAClC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAE,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;aACzI;QACH,CAAC,CAAC,CAAC;QAEH,4DAA4D;QAE5D,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,aAAa;QACX,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC7C,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAEtD,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,WAAW,IAAI,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,WAAW,IAAI,OAAO,WAAW,CAAC,WAAW,KAAK,WAAW,EAAE;YACrI,OAAO,WAAW,CAAC;SACpB;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,uBAAuB,CAAC,MAA0C,EAAE,GAAW;QACpF,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;aACjC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,iBAAiB,EAAE,KAAK,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QAC9E,OAAO,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,WAAW,CAAC,KAA2B;QAC5C,OAAO,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACtF,CAAC;CACF;AAvSD,iCAuSC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQSService.d.ts","sourceRoot":"","sources":["../../src/services/SQSService.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAKL,SAAS,EAET,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"SQSService.d.ts","sourceRoot":"","sources":["../../src/services/SQSService.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ const client_lambda_1 = require("@aws-sdk/client-lambda");
|
|
|
8
8
|
const client_sqs_1 = require("@aws-sdk/client-sqs");
|
|
9
9
|
const node_http_handler_1 = require("@smithy/node-http-handler");
|
|
10
10
|
const alai_1 = __importDefault(require("alai"));
|
|
11
|
-
const async_1 = require("async");
|
|
12
11
|
const uuid_1 = require("uuid");
|
|
13
12
|
const DependencyAwareClass_1 = __importDefault(require("../core/DependencyAwareClass"));
|
|
14
13
|
const SQSMessageModel_1 = __importDefault(require("../models/SQSMessageModel"));
|
|
@@ -214,97 +213,85 @@ class SQSService extends DependencyAwareClass_1.default {
|
|
|
214
213
|
* @param queue
|
|
215
214
|
* @param messageModels
|
|
216
215
|
*/
|
|
217
|
-
batchDelete(queue, messageModels) {
|
|
216
|
+
async batchDelete(queue, messageModels) {
|
|
218
217
|
const queueUrl = this.queueUrls[queue];
|
|
219
218
|
const logger = this.di.get(LoggerService_1.default);
|
|
220
219
|
const timer = this.di.get(TimerService_1.default);
|
|
221
220
|
const timerId = `sqs-batch-delete-${(0, uuid_1.v4)()} - Queue: '${queueUrl}'`;
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
}
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
})).finally(() => {
|
|
243
|
-
timer.stop(timerId);
|
|
244
|
-
}).catch((error) => {
|
|
245
|
-
logger.error(error);
|
|
246
|
-
}).then(() => {
|
|
247
|
-
resolve();
|
|
248
|
-
});
|
|
249
|
-
});
|
|
250
|
-
});
|
|
221
|
+
timer.start(timerId);
|
|
222
|
+
const messagesForDeletion = messageModels
|
|
223
|
+
.filter((messageModel) => (messageModel instanceof SQSMessageModel_1.default
|
|
224
|
+
&& messageModel.isForDeletion()))
|
|
225
|
+
.map((messageModel) => ({
|
|
226
|
+
Id: messageModel.getMessageId(),
|
|
227
|
+
ReceiptHandle: messageModel.getReceiptHandle(),
|
|
228
|
+
}));
|
|
229
|
+
try {
|
|
230
|
+
await this.sqs.send(new client_sqs_1.DeleteMessageBatchCommand({
|
|
231
|
+
Entries: messagesForDeletion,
|
|
232
|
+
QueueUrl: queueUrl,
|
|
233
|
+
}));
|
|
234
|
+
}
|
|
235
|
+
catch (error) {
|
|
236
|
+
logger.error(error);
|
|
237
|
+
}
|
|
238
|
+
finally {
|
|
239
|
+
timer.stop(timerId);
|
|
240
|
+
}
|
|
251
241
|
}
|
|
252
242
|
/**
|
|
253
243
|
* Check SQS status.
|
|
254
244
|
*/
|
|
255
|
-
checkStatus() {
|
|
245
|
+
async checkStatus() {
|
|
256
246
|
const logger = this.di.get(LoggerService_1.default);
|
|
257
247
|
const timer = this.di.get(TimerService_1.default);
|
|
258
248
|
const timerId = `sqs-list-queues-${(0, uuid_1.v4)()}`;
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
this.sqs.send(new client_sqs_1.ListQueuesCommand())
|
|
263
|
-
|
|
264
|
-
timer.stop(timerId);
|
|
265
|
-
})
|
|
266
|
-
.then((data) => {
|
|
267
|
-
if (typeof data.QueueUrls === 'undefined' || data.QueueUrls.length === 0) {
|
|
268
|
-
status = 'APPLICATION_FAILURE';
|
|
269
|
-
}
|
|
270
|
-
})
|
|
271
|
-
.catch((error) => {
|
|
272
|
-
logger.error(error);
|
|
249
|
+
timer.start(timerId);
|
|
250
|
+
let status = 'OK';
|
|
251
|
+
try {
|
|
252
|
+
const result = await this.sqs.send(new client_sqs_1.ListQueuesCommand());
|
|
253
|
+
if (typeof result.QueueUrls === 'undefined' || result.QueueUrls.length === 0) {
|
|
273
254
|
status = 'APPLICATION_FAILURE';
|
|
274
|
-
}
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
catch (error) {
|
|
258
|
+
logger.error(error);
|
|
259
|
+
status = 'APPLICATION_FAILURE';
|
|
260
|
+
}
|
|
261
|
+
finally {
|
|
262
|
+
timer.stop(timerId);
|
|
263
|
+
}
|
|
264
|
+
return {
|
|
265
|
+
service: 'SQS',
|
|
266
|
+
status,
|
|
267
|
+
};
|
|
282
268
|
}
|
|
283
269
|
/**
|
|
284
270
|
* Get the approximate number of messages in a queue.
|
|
285
271
|
*
|
|
286
272
|
* @param queue
|
|
287
273
|
*/
|
|
288
|
-
getMessageCount(queue) {
|
|
274
|
+
async getMessageCount(queue) {
|
|
289
275
|
const queueUrl = this.queueUrls[queue];
|
|
290
276
|
const logger = this.di.get(LoggerService_1.default);
|
|
291
277
|
const timer = this.di.get(TimerService_1.default);
|
|
292
278
|
const timerId = `sqs-get-queue-attributes-${(0, uuid_1.v4)()} - Queue: '${queueUrl}'`;
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
this.sqs.send(new client_sqs_1.GetQueueAttributesCommand({
|
|
279
|
+
timer.start(timerId);
|
|
280
|
+
try {
|
|
281
|
+
const result = await this.sqs.send(new client_sqs_1.GetQueueAttributesCommand({
|
|
296
282
|
AttributeNames: ['ApproximateNumberOfMessages'],
|
|
297
283
|
QueueUrl: queueUrl,
|
|
298
|
-
}))
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
284
|
+
}));
|
|
285
|
+
const messageCount = result.Attributes?.ApproximateNumberOfMessages || '0';
|
|
286
|
+
return Number.parseInt(messageCount, 10);
|
|
287
|
+
}
|
|
288
|
+
catch (error) {
|
|
289
|
+
logger.error(error);
|
|
290
|
+
return 0;
|
|
291
|
+
}
|
|
292
|
+
finally {
|
|
293
|
+
timer.stop(timerId);
|
|
294
|
+
}
|
|
308
295
|
}
|
|
309
296
|
/**
|
|
310
297
|
* Publish to message queue.
|
|
@@ -400,31 +387,30 @@ class SQSService extends DependencyAwareClass_1.default {
|
|
|
400
387
|
* @param queue string
|
|
401
388
|
* @param timeout number
|
|
402
389
|
*/
|
|
403
|
-
receive(queue, timeout = 15) {
|
|
390
|
+
async receive(queue, timeout = 15) {
|
|
404
391
|
const queueUrl = this.queueUrls[queue];
|
|
405
392
|
const logger = this.di.get(LoggerService_1.default);
|
|
406
393
|
const timer = this.di.get(TimerService_1.default);
|
|
407
394
|
const timerId = `sqs-receive-message-${(0, uuid_1.v4)()} - Queue: '${queueUrl}'`;
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
this.sqs.send(new client_sqs_1.ReceiveMessageCommand({
|
|
395
|
+
timer.start(timerId);
|
|
396
|
+
try {
|
|
397
|
+
const result = await this.sqs.send(new client_sqs_1.ReceiveMessageCommand({
|
|
411
398
|
QueueUrl: queueUrl,
|
|
412
399
|
VisibilityTimeout: timeout,
|
|
413
400
|
MaxNumberOfMessages: 10,
|
|
414
|
-
}))
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
});
|
|
401
|
+
}));
|
|
402
|
+
if (typeof result.Messages === 'undefined') {
|
|
403
|
+
return [];
|
|
404
|
+
}
|
|
405
|
+
return result.Messages.map((message) => new SQSMessageModel_1.default(message));
|
|
406
|
+
}
|
|
407
|
+
catch (error) {
|
|
408
|
+
logger.error(error);
|
|
409
|
+
throw error;
|
|
410
|
+
}
|
|
411
|
+
finally {
|
|
412
|
+
timer.stop(timerId);
|
|
413
|
+
}
|
|
428
414
|
}
|
|
429
415
|
}
|
|
430
416
|
exports.default = SQSService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQSService.js","sourceRoot":"","sources":["../../src/services/SQSService.ts"],"names":[],"mappings":";;;;;;AAAA,0DAGgC;AAChC,oDAQ6B;AAC7B,iEAA4D;AAC5D,gDAAwB;AACxB
|
|
1
|
+
{"version":3,"file":"SQSService.js","sourceRoot":"","sources":["../../src/services/SQSService.ts"],"names":[],"mappings":";;;;;;AAAA,0DAGgC;AAChC,oDAQ6B;AAC7B,iEAA4D;AAC5D,gDAAwB;AACxB,+BAAkC;AAElC,wFAAgE;AAGhE,gFAAwD;AAExD,oEAA4C;AAC5C,kEAA0C;AAsD1C;;GAEG;AACU,QAAA,iBAAiB,GAAG;IAC/B;;;;OAIG;IACH,MAAM,EAAE,QAAQ;IAEhB;;;OAGG;IACH,KAAK,EAAE,OAAO;IAEd;;OAEG;IACH,GAAG,EAAE,KAAK;CACX,CAAC;AAEF;;;GAGG;AACU,QAAA,yBAAyB,GAAG;IACvC;;;;;OAKG;IACH,KAAK,EAAE,OAAO;IAEd;;OAEG;IACH,KAAK,EAAE,OAAO;CACN,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+FG;AACH,MAAqB,UAEnB,SAAQ,8BAAoB;IAW5B,YAAY,EAAgC;QAC1C,KAAK,CAAC,EAAE,CAAC,CAAC;QAEV,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,IAAI,EAAE,CAAC;QACnC,IAAI,CAAC,cAAc,GAAG,MAAM,EAAE,cAAc,IAAI,EAAE,CAAC;QAEnD,MAAM,EACJ,+BAA+B,EAAE,WAAW,GAAG,WAAW,EAC1D,+BAA+B,EAAE,WAAW,GAAG,MAAM,EACrD,+BAA+B,EAAE,WAAW,GAAG,yBAAiB,CAAC,MAAM,EACvE,cAAc,EACd,MAAM,GACP,GAAG,OAAO,CAAC,GAAG,CAAC;QAEhB,MAAM,SAAS,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,kBAAkB,IAAI,cAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;eACtE,cAAc,CAAC;QAEpB,IAAI,EAAE,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,yBAAiB,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC3E,MAAM,IAAI,KAAK,CAAC,4CAA4C,WAAW,IAAI;kBACvE,sBAAsB,MAAM,CAAC,MAAM,CAAC,yBAAiB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC1E;QAED,MAAM,cAAc,GAAG,EAAE,CAAC,SAAS,IAAI,WAAW,KAAK,yBAAiB,CAAC,KAAK,CAAC;QAC/E,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,WAAW,CACjC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAC9B,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,cAAc;gBACxC,CAAC,CAAC,UAAU,WAAW,IAAI,WAAW,UAAU,SAAS,EAAE;gBAC3D,CAAC,CAAC,eAAe,MAAM,kBAAkB,SAAS,IAAI,SAAS,EAAE,CAAC,CACrE,CAAC,CACmC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,IAAI,GAAG;QACL,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACd,IAAI,CAAC,IAAI,GAAG,IAAI,sBAAS,CAAC;gBACxB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM;gBAC1B,cAAc,EAAE,IAAI,mCAAe,CAAC;oBAClC,yCAAyC;oBACzC,iBAAiB,EAAE,CAAC,GAAG,IAAI;oBAC3B,aAAa,EAAE,CAAC,GAAG,IAAI;iBACxB,CAAC;gBACF,WAAW,EAAE,CAAC,EAAE,gDAAgD;aACjE,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;YAEhD,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;aACpE;YAED,qBAAqB;YACrB,IAAI,CAAC,OAAO,GAAG,IAAI,4BAAY,CAAC;gBAC9B,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;gBAC9B,QAAQ;aACT,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;;;;OAKG;IACH,MAAM,KAAK,WAAW;QACpB,OAAO,OAAO,CAAC,GAAG,CAAC,+BAA+B,IAAI,yBAAiB,CAAC,MAAM,CAAC;IACjF,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CAAC,KAAyB,EAAE,aAAgC;QAC3E,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAa,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,sBAAY,CAAC,CAAC;QAExC,MAAM,OAAO,GAAG,oBAAoB,IAAA,SAAI,GAAE,cAAc,QAAQ,GAAG,CAAC;QACpE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAErB,MAAM,mBAAmB,GAAG,aAAa;aACtC,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CACxB,YAAY,YAAY,yBAAe;eACpC,YAAY,CAAC,aAAa,EAAE,CAChC,CAAC;aACD,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YACtB,EAAE,EAAE,YAAY,CAAC,YAAY,EAAE;YAC/B,aAAa,EAAE,YAAY,CAAC,gBAAgB,EAAE;SAC/C,CAAC,CAAC,CAAC;QAEN,IAAI;YACF,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,sCAAyB,CAAC;gBAChD,OAAO,EAAE,mBAAmB;gBAC5B,QAAQ,EAAE,QAAQ;aACnB,CAAC,CAAC,CAAC;SACL;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACrB;gBAAS;YACR,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACrB;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW;QACf,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAa,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,sBAAY,CAAC,CAAC;QAExC,MAAM,OAAO,GAAG,mBAAmB,IAAA,SAAI,GAAE,EAAE,CAAC;QAC5C,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAErB,IAAI,MAAM,GAAW,IAAI,CAAC;QAC1B,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,8BAAiB,EAAE,CAAC,CAAC;YAC5D,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,WAAW,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC5E,MAAM,GAAG,qBAAqB,CAAC;aAChC;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,GAAG,qBAAqB,CAAC;SAChC;gBAAS;YACR,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACrB;QAED,OAAO;YACL,OAAO,EAAE,KAAK;YACd,MAAM;SACP,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,eAAe,CAAC,KAAyB;QAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAa,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,sBAAY,CAAC,CAAC;QAExC,MAAM,OAAO,GAAG,4BAA4B,IAAA,SAAI,GAAE,cAAc,QAAQ,GAAG,CAAC;QAC5E,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAErB,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,sCAAyB,CAAC;gBAC/D,cAAc,EAAE,CAAC,6BAA6B,CAAC;gBAC/C,QAAQ,EAAE,QAAQ;aACnB,CAAC,CAAC,CAAC;YAEJ,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,EAAE,2BAA2B,IAAI,GAAG,CAAC;YAC3E,OAAO,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;SAC1C;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpB,OAAO,CAAC,CAAC;SACV;gBAAS;YACR,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACrB;IACH,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,KAAK,CAAC,OAAO,CAAC,KAAyB,EAAE,aAAqB,EAAE,cAA8B,EAAE,cAAiC,iCAAyB,CAAC,KAAK;QAC9J,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,iCAAyB,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YACnE,MAAM,IAAI,KAAK,CAAC,oCAAoC,WAAW,EAAE,CAAC,CAAC;SACpE;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,sBAAY,CAAC,CAAC;QACxC,MAAM,OAAO,GAAG,oBAAoB,IAAA,SAAI,GAAE,cAAc,QAAQ,GAAG,CAAC;QAEpE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAErB,MAAM,iBAAiB,GAA4B;YACjD,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC;YAC1C,QAAQ,EAAE,QAAQ;SACnB,CAAC;QAEF,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC9B,iBAAiB,CAAC,sBAAsB,GAAG,IAAA,SAAI,GAAE,CAAC;YAClD,iBAAiB,CAAC,cAAc,GAAG,cAAc,IAAI,IAAA,SAAI,GAAE,CAAC;SAC7D;QAED,IAAI;YACF,IAAI,IAAI,CAAC,EAAE,CAAC,SAAS,IAAI,UAAU,CAAC,WAAW,KAAK,yBAAiB,CAAC,MAAM,EAAE;gBAC5E,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;aACrD;iBAAM;gBACL,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,+BAAkB,CAAC,iBAAiB,CAAC,CAAC,CAAC;aAChE;SACF;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,WAAW,KAAK,iCAAyB,CAAC,KAAK,EAAE;gBACnD,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAa,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACxC,OAAO,IAAI,CAAC;aACb;YACD,MAAM,KAAK,CAAC;SACb;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,cAAc,CAAC,KAAyB,EAAE,iBAA0C;QACxF,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;SAC9E;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAEhD,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,IAAI,KAAK,CACb,4BAA4B,KAAK,mCAAmC;kBAClE,2DAA2D,CAC9D,CAAC;SACH;QAED,MAAM,cAAc,GAAG,iBAAiB,CAAC;QAEzC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;YAC7B,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,iBAAiB,CAAC,WAAW;iBACpC;aACF;SACF,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,6BAAa,CAAC;YACvC,YAAY;YACZ,cAAc;YACd,OAAO;SACR,CAAC,CAAC,CAAC;IACN,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,KAAyB,EAAE,OAAO,GAAG,EAAE;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,uBAAa,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,sBAAY,CAAC,CAAC;QAExC,MAAM,OAAO,GAAG,uBAAuB,IAAA,SAAI,GAAE,cAAc,QAAQ,GAAG,CAAC;QACvE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAErB,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,kCAAqB,CAAC;gBAC3D,QAAQ,EAAE,QAAQ;gBAClB,iBAAiB,EAAE,OAAO;gBAC1B,mBAAmB,EAAE,EAAE;aACxB,CAAC,CAAC,CAAC;YAEJ,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,WAAW,EAAE;gBAC1C,OAAO,EAAE,CAAC;aACX;YAED,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,yBAAe,CAAC,OAAO,CAAC,CAAC,CAAC;SACvE;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,KAAK,CAAC;SACb;gBAAS;YACR,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACrB;IACH,CAAC;CACF;AApUD,6BAoUC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@comicrelief/lambda-wrapper",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.3",
|
|
4
4
|
"description": "Lambda wrapper for all Comic Relief Serverless Projects",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"author": "Adam Clark",
|
|
@@ -53,7 +53,6 @@
|
|
|
53
53
|
"@smithy/node-http-handler": "^2.5.0",
|
|
54
54
|
"@types/aws-lambda": "^8.10.134",
|
|
55
55
|
"alai": "1.0.3",
|
|
56
|
-
"async": "^3.2.5",
|
|
57
56
|
"axios": "^1.6.7",
|
|
58
57
|
"useragent": "2.3.0",
|
|
59
58
|
"uuid": "^9.0.1",
|