@creator.co/wapi 1.2.0-alpha9 → 1.2.0-beta10
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/package.json +1 -1
- package/dist/src/API/Request.d.ts +1 -0
- package/dist/src/API/Request.js +8 -0
- package/dist/src/API/Request.js.map +1 -1
- package/dist/src/API/Response.d.ts +3 -3
- package/dist/src/API/Response.js.map +1 -1
- package/dist/src/API/Utils.d.ts +0 -1
- package/dist/src/API/Utils.js +0 -3
- package/dist/src/API/Utils.js.map +1 -1
- package/dist/src/BaseEvent/EventProcessor.d.ts +4 -4
- package/dist/src/BaseEvent/EventProcessor.js.map +1 -1
- package/dist/src/BaseEvent/Transaction.d.ts +4 -4
- package/dist/src/BaseEvent/Transaction.js +1 -1
- package/dist/src/BaseEvent/Transaction.js.map +1 -1
- package/dist/src/Globals.js +1 -1
- package/dist/src/Globals.js.map +1 -1
- package/dist/src/Logger/Logger.d.ts +0 -1
- package/dist/src/Logger/Logger.js +23 -37
- package/dist/src/Logger/Logger.js.map +1 -1
- package/dist/src/Server/Router.d.ts +2 -2
- package/dist/src/Server/lib/Server.d.ts +1 -1
- package/dist/src/Server/lib/Server.js +55 -51
- package/dist/src/Server/lib/Server.js.map +1 -1
- package/dist/src/Server/lib/container/GenericHandler.js +1 -0
- package/dist/src/Server/lib/container/GenericHandler.js.map +1 -1
- package/dist/src/Validation/Validator.d.ts +2 -2
- package/dist/src/Validation/Validator.js.map +1 -1
- package/package.json +1 -1
- package/src/API/Request.ts +9 -0
- package/src/API/Response.ts +9 -6
- package/src/API/Utils.ts +0 -3
- package/src/BaseEvent/EventProcessor.ts +12 -8
- package/src/BaseEvent/Transaction.ts +12 -9
- package/src/Globals.ts +2 -1
- package/src/Logger/Logger.ts +20 -40
- package/src/Server/Router.ts +2 -2
- package/src/Server/lib/Server.ts +16 -9
- package/src/Server/lib/container/GenericHandler.ts +1 -0
- package/src/Validation/Validator.ts +2 -2
package/dist/package.json
CHANGED
package/dist/src/API/Request.js
CHANGED
|
@@ -72,6 +72,14 @@ var Request = /** @class */ (function () {
|
|
|
72
72
|
var hOrigin = this.getHeader("X-Forwarded-For");
|
|
73
73
|
return origin ? origin : hOrigin ? hOrigin : "unknow";
|
|
74
74
|
};
|
|
75
|
+
//ugly fix
|
|
76
|
+
Request.prototype.setFixedPathParams = function (keys, result) {
|
|
77
|
+
var _this = this;
|
|
78
|
+
this.requestEvent.pathParameters = {};
|
|
79
|
+
keys.forEach(function (key, index) {
|
|
80
|
+
return (_this.requestEvent.pathParameters[key.name] = result[index + 1]);
|
|
81
|
+
});
|
|
82
|
+
};
|
|
75
83
|
return Request;
|
|
76
84
|
}());
|
|
77
85
|
exports.default = Request;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../../src/API/Request.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../../src/API/Request.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ export type ResponseErrorType = {
|
|
|
4
4
|
err: string;
|
|
5
5
|
errCode?: string;
|
|
6
6
|
};
|
|
7
|
-
export default class Response<B =
|
|
7
|
+
export default class Response<B = null> {
|
|
8
8
|
private _statusCode;
|
|
9
9
|
private _body;
|
|
10
10
|
private _isPipingOut;
|
|
@@ -23,12 +23,12 @@ export default class Response<B = any | ResponseErrorType> {
|
|
|
23
23
|
getBody(): B;
|
|
24
24
|
appendIntoBody(key: string, value: any): void;
|
|
25
25
|
appendHeader(key: string, value: any): void;
|
|
26
|
-
build(context: Context, transaction: Transaction<any>, _optDoNotCallContext: boolean): Promise<void>;
|
|
26
|
+
build(context: Context, transaction: Transaction<any, B>, _optDoNotCallContext: boolean): Promise<void>;
|
|
27
27
|
private _pipe;
|
|
28
28
|
private _rawContext;
|
|
29
29
|
static MissingParamResponse(paramName: string): Response<ResponseErrorType>;
|
|
30
30
|
static MissingQueryResponse(paramName: string): Response<ResponseErrorType>;
|
|
31
|
-
static BadRequestResponse
|
|
31
|
+
static BadRequestResponse(msg?: string, errCode?: string, optBody?: any): Response<ResponseErrorType>;
|
|
32
32
|
static BadRequestResponseWithRollback(msg: string, errCode: string, optBody?: any): Response<ResponseErrorType>;
|
|
33
33
|
static UnauthorizedResponse(msg: string, errCode: string): Response<ResponseErrorType>;
|
|
34
34
|
static SuccessResponse<T>(body: T): Response<T>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Response.js","sourceRoot":"","sources":["../../../src/API/Response.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,sCAAgC;AAChC,EAAE;AACF;IAA0B,+BAAK;IAC7B,qBAAY,IAAS;QAArB,iBAIC;QAHC,IAAM,GAAG,GAAG,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAA;gBAClE,kBAAM,GAAG,CAAC;QACV,KAAI,CAAC,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAA;;IAC9D,CAAC;IACH,kBAAC;AAAD,CAAC,AAND,CAA0B,KAAK,GAM9B;AAMD,EAAE;AACF;IASE,EAAE;IACF,kBACE,UAAkB,EAClB,IAAO,EACP,YAOa;QAEb,WAAW;QACX,IAAI,CAAC,WAAW,GAAG,UAAU,CAAA;QAC7B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,QAAQ,GAAG;YACd,6BAA6B,EAAE,GAAG;YAClC,kCAAkC,EAAE,IAAI;YACxC,cAAc,EAAE,kBAAkB;SACnC,CAAA;QACD,YAAY;QACZ,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA,CAAC,qFAAqF;QAC/G,UAAU;QACV,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,CAAA,CAAA,CAAC,EAAE;QACnD,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,CAAA,CAAA;QACtC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,CAAA,CAAA;QAClD,IAAI,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,oBAAoB,CAAA,CAAA;IAClE,CAAC;IACM,0BAAO,GAAd;QACE,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IACM,0BAAO,GAAd;QACE,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;IACM,iCAAc,GAArB,UAAsB,GAAW,EAAE,KAAU;QAC3C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IACzB,CAAC;IACM,+BAAY,GAAnB,UAAoB,GAAW,EAAE,KAAU;QACzC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IAC5B,CAAC;IACY,wBAAK,GAAlB,UACE,OAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"Response.js","sourceRoot":"","sources":["../../../src/API/Response.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,sCAAgC;AAChC,EAAE;AACF;IAA0B,+BAAK;IAC7B,qBAAY,IAAS;QAArB,iBAIC;QAHC,IAAM,GAAG,GAAG,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAA;gBAClE,kBAAM,GAAG,CAAC;QACV,KAAI,CAAC,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAA;;IAC9D,CAAC;IACH,kBAAC;AAAD,CAAC,AAND,CAA0B,KAAK,GAM9B;AAMD,EAAE;AACF;IASE,EAAE;IACF,kBACE,UAAkB,EAClB,IAAO,EACP,YAOa;QAEb,WAAW;QACX,IAAI,CAAC,WAAW,GAAG,UAAU,CAAA;QAC7B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,QAAQ,GAAG;YACd,6BAA6B,EAAE,GAAG;YAClC,kCAAkC,EAAE,IAAI;YACxC,cAAc,EAAE,kBAAkB;SACnC,CAAA;QACD,YAAY;QACZ,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA,CAAC,qFAAqF;QAC/G,UAAU;QACV,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,CAAA,CAAA,CAAC,EAAE;QACnD,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,CAAA,CAAA;QACtC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,CAAA,CAAA;QAClD,IAAI,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,oBAAoB,CAAA,CAAA;IAClE,CAAC;IACM,0BAAO,GAAd;QACE,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IACM,0BAAO,GAAd;QACE,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;IACM,iCAAc,GAArB,UAAsB,GAAW,EAAE,KAAU;QAC3C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IACzB,CAAC;IACM,+BAAY,GAAnB,UAAoB,GAAW,EAAE,KAAU;QACzC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IAC5B,CAAC;IACY,wBAAK,GAAlB,UACE,OAAgB,EAChB,WAAgC,EAChC,oBAA6B;;;;;;wBAE7B,gBAAgB;wBAChB,IAAI,IAAI,CAAC,YAAY;4BAAE,sBAAM;wBAC7B,IAAI,IAAI,CAAC,YAAY;4BAAE,sBAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;gCAEjD,uBAAuB;8BAF0B;wBAEjD,uBAAuB;wBACvB,IACE,WAAW,CAAC,OAAO,CAAC,YAAY,EAAE;4BAClC,IAAI,CAAC,KAAK;4BACV,CAAC,IAAI,CAAC,oBAAoB;4BAE1B,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,WAAW,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAA,CAAC,uBAAuB;wBAClG,sBAAsB;wBACtB,IAAI,IAAI,CAAC,OAAO;4BAAE,sBAAO,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC;gCAE/D,gBAAgB;8BAF+C;wBAGzD,CAAC,cACL,UAAU,EAAE,IAAI,CAAC,WAAW,EAC5B,OAAO,EAAE,IAAI,CAAC,QAAQ,IACnB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAC5D,CAAA;wBACD,qCAAqC;wBACrC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;6BAEvB,WAAW,CAAC,aAAa,EAAzB,wBAAyB;wBAAE,qBAAM,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC;4BACpE,0FAA0F;0BADtB;;wBAArC,SAAqC,CAAA;;;wBACpE,0FAA0F;wBAC1F,IAAI,CAAC,oBAAoB;4BAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;;;;;KAC9C;IACO,wBAAK,GAAb,UAAc,OAAgB;QAC5B,wBAAwB;QACxB,IAAI,IAAI,CAAC,YAAY;YAAE,OAAM;QAC7B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;QACxB,gBAAgB;QAChB,IAAM,CAAC,GAAG;YACR,UAAU,EAAE,IAAI,CAAC,WAAW;YAC5B,IAAI,EAAE,IAAI,CAAC,KAAK;YAChB,OAAO,EAAE,IAAI,CAAC,QAAQ;SACvB,CAAA;QACD,qCAAqC;QACrC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;IACpB,CAAC;IACO,8BAAW,GAAnB,UACE,OAAgB,EAChB,WAAiC;QAEjC,qCAAqC;QACrC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACpC,IAAI,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG;YAChD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;aACxB;YACH,IAAI,CAAC,IAAI,CAAC,aAAa;gBAAE,OAAO,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;;gBAC7D,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;SACvC;IACH,CAAC;IAED,eAAe;IACD,6BAAoB,GAAlC,UACE,SAAiB;QAEjB,OAAO,CAAC,IAAI,CAAC,2CAAoC,SAAS,iBAAc,CAAC,CAAA;QACzE,OAAO,IAAI,QAAQ,CAAoB,GAAG,EAAE;YAC1C,GAAG,EAAE,0CAAmC,SAAS,iBAAc;YAC/D,OAAO,EAAE,iBAAO,CAAC,sBAAsB;SACxC,CAAC,CAAA;IACJ,CAAC;IACa,6BAAoB,GAAlC,UACE,SAAiB;QAEjB,OAAO,CAAC,IAAI,CAAC,4CAAqC,SAAS,iBAAc,CAAC,CAAA;QAC1E,OAAO,IAAI,QAAQ,CAAoB,GAAG,EAAE;YAC1C,GAAG,EAAE,2CAAoC,SAAS,iBAAc;YAChE,OAAO,EAAE,iBAAO,CAAC,sBAAsB;SACxC,CAAC,CAAA;IACJ,CAAC;IACa,2BAAkB,GAAhC,UACE,GAAY,EACZ,OAAgB,EAChB,OAAa;QAEb,OAAO,CAAC,IAAI,CAAC,wBAAiB,GAAG,CAAE,CAAC,CAAA;QACpC,OAAO,IAAI,QAAQ,CAAoB,GAAG,sBACxC,GAAG,EAAE,GAAG,IACL,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GACrC,CAAC,OAAO,IAAI,EAAE,CAAC,EAClB,CAAA;IACJ,CAAC;IACa,uCAA8B,GAA5C,UACE,GAAW,EACX,OAAe,EACf,OAAa;QAEb,OAAO,CAAC,IAAI,CAAC,wBAAiB,GAAG,CAAE,CAAC,CAAA;QACpC,OAAO,IAAI,QAAQ,CAAoB,GAAG,sBACxC,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,IAAI,IACX,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GACrC,CAAC,OAAO,IAAI,EAAE,CAAC,EAClB,CAAA;IACJ,CAAC;IACa,6BAAoB,GAAlC,UACE,GAAW,EACX,OAAe;QAEf,OAAO,CAAC,IAAI,CAAC,4BAAqB,GAAG,CAAE,CAAC,CAAA;QACxC,OAAO,IAAI,QAAQ,CAAoB,GAAG,aACxC,GAAG,EAAE,GAAG,IACL,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACxC,CAAA;IACJ,CAAC;IACa,wBAAe,GAA7B,UAAiC,IAAO;QACtC,OAAO,IAAI,QAAQ,CAAI,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAM,CAAC,CAAA;IACtD,CAAC;IACa,yBAAgB,GAA9B,UAA+B,GAAW;QACxC,IAAM,IAAI,GAAG,IAAI,QAAQ,CAAO,GAAG,EAAE,IAAI,CAAC,CAAA;QAC1C,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;QAClC,OAAO,IAAI,CAAA;IACb,CAAC;IACa,iCAAwB,GAAtC;QACE,OAAO,IAAI,QAAQ,CAAO,GAAG,EAAE,IAAI,CAAC,CAAA;IACtC,CAAC;IACa,8BAAqB,GAAnC,UACE,MAAW,EACX,WAAmB;QAEnB,IAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACnD,YAAY,EAAE,IAAI;SACnB,CAAC,CAAA;QACF,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;QAC7C,IAAI,WAAW;YAAE,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,WAAW,CAAC,CAAA;QAC/D,OAAO,IAAI,CAAA;IACb,CAAC;IACa,uBAAc,GAA5B,UAAgC,IAAO,EAAE,YAAqB;QAC5D,IAAM,IAAI,GAAG,IAAI,QAAQ,CAAI,YAAY,IAAI,GAAG,EAAE,IAAI,CAAC,CAAA;QACvD,OAAO,IAAI,CAAA;IACb,CAAC;IACH,eAAC;AAAD,CAAC,AA7LD,IA6LC"}
|
package/dist/src/API/Utils.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
export default class Utils {
|
|
2
2
|
static isHybridlessContainer(): boolean;
|
|
3
|
-
static toDoubleDigit(str: string | number): string;
|
|
4
3
|
static isValidString(string: string): boolean;
|
|
5
4
|
static parseIntNullIfNaN(string: string): number | null;
|
|
6
5
|
static parseObjectNullIfEmpty(string: string): any | null;
|
package/dist/src/API/Utils.js
CHANGED
|
@@ -6,9 +6,6 @@ var Utils = /** @class */ (function () {
|
|
|
6
6
|
Utils.isHybridlessContainer = function () {
|
|
7
7
|
return !!process.env.HYBRIDLESS_RUNTIME;
|
|
8
8
|
};
|
|
9
|
-
Utils.toDoubleDigit = function (str) {
|
|
10
|
-
return String("0" + str).slice(-2);
|
|
11
|
-
};
|
|
12
9
|
Utils.isValidString = function (string) {
|
|
13
10
|
return (string === null || string === void 0 ? void 0 : string.length) > 0 && !Array.isArray(string);
|
|
14
11
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/API/Utils.ts"],"names":[],"mappings":";;AAAA;IAAA;
|
|
1
|
+
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/API/Utils.ts"],"names":[],"mappings":";;AAAA;IAAA;IAsCA,CAAC;IArCe,2BAAqB,GAAnC;QACE,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAA;IACzC,CAAC;IACa,mBAAa,GAA3B,UAA4B,MAAc;QACxC,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,IAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACrD,CAAC;IACa,uBAAiB,GAA/B,UAAgC,MAAc;QAC5C,IAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;QAC1B,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5B,CAAC;IACa,4BAAsB,GAApC,UAAqC,MAAc;QACjD,IAAI,CAAC,GAAG,IAAI,CAAA;QACZ,IAAI;YACF,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;YACtB,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC;gBAAE,CAAC,GAAG,IAAI,CAAA;SACzC;QAAC,OAAO,CAAC,EAAE;YACV,WAAW;SACZ;QACD,OAAO,CAAC,CAAA;IACV,CAAC;IACa,mBAAa,GAA3B,UAA4B,MAAc;QACxC,IAAI,SAAS,GAAG,GAAG,CAAA;QACnB,IAAI;YACF,SAAS,GAAG,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;SAClC;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,CAAC,CAAC,CAAA;SAClD;QACD,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;IACa,iCAA2B,GAAzC,UAA0C,GAAQ,EAAE,GAAW;QAC7D,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAA;QACrB,IAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAC1C,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,WAAW,EAAE,EAArC,CAAqC,CAC7C,CAAA;QACD,IAAI,cAAc,IAAI,cAAc,IAAI,EAAE;YAAE,OAAO,GAAG,CAAC,cAAc,CAAC,CAAA;QACtE,OAAO,IAAI,CAAA;IACb,CAAC;IACH,YAAC;AAAD,CAAC,AAtCD,IAsCC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import type { Context, SQSBatchResponse, SQSEvent } from "aws-lambda";
|
|
2
2
|
import Transaction, { TransactionConfig } from "./Transaction";
|
|
3
|
-
import Response from "../API/Response";
|
|
4
|
-
export type EventProcessorExecution = (transaction: Transaction, recordContent: string | object) => Promise<Response | SQSBatchResponse>;
|
|
3
|
+
import Response, { ResponseErrorType } from "../API/Response";
|
|
4
|
+
export type EventProcessorExecution = (transaction: Transaction<null, ResponseErrorType>, recordContent: string | object) => Promise<Response | SQSBatchResponse>;
|
|
5
5
|
export default class EventProcessor {
|
|
6
6
|
private readonly _allowFailure;
|
|
7
7
|
private readonly _apiConfig;
|
|
8
8
|
private readonly _context;
|
|
9
9
|
private readonly _event;
|
|
10
10
|
constructor(event: SQSEvent, context: Context, config: TransactionConfig, allowFailure?: boolean);
|
|
11
|
-
processEvent(execution: EventProcessorExecution, doNotDecodeMessage?: boolean): Promise<Response | null | SQSBatchResponse>;
|
|
12
|
-
_processRawEvent(execution: EventProcessorExecution, doNotDecodeMessage: boolean): Promise<Response | null | SQSBatchResponse>;
|
|
11
|
+
processEvent(execution: EventProcessorExecution, doNotDecodeMessage?: boolean): Promise<Response<ResponseErrorType> | null | SQSBatchResponse>;
|
|
12
|
+
_processRawEvent(execution: EventProcessorExecution, doNotDecodeMessage: boolean): Promise<Response<ResponseErrorType> | null | SQSBatchResponse>;
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventProcessor.js","sourceRoot":"","sources":["../../../src/BaseEvent/EventProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,6CAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"EventProcessor.js","sourceRoot":"","sources":["../../../src/BaseEvent/EventProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import type { APIGatewayEvent, Context, SQSBatchResponse, SQSEvent } from "aws-lambda";
|
|
2
2
|
import Request from "../API/Request";
|
|
3
|
-
import Response from "../API/Response";
|
|
3
|
+
import Response, { ResponseErrorType } from "../API/Response";
|
|
4
4
|
import Logger, { LoggerConfig } from "../Logger/Logger";
|
|
5
5
|
import Publisher, { PublisherConfig } from "../Publisher/Publisher";
|
|
6
|
-
export type TransactionExecution<T, B
|
|
6
|
+
export type TransactionExecution<T, B> = (transaction: T) => Promise<Response<B> | SQSBatchResponse>;
|
|
7
7
|
export type TransactionConfig = {
|
|
8
8
|
throwOnErrors?: boolean;
|
|
9
9
|
syncReturn?: boolean;
|
|
@@ -19,9 +19,9 @@ export default class Transaction<T = object, B = null> {
|
|
|
19
19
|
readonly logger: Logger;
|
|
20
20
|
readonly request: Request<T>;
|
|
21
21
|
readonly publisher: Publisher;
|
|
22
|
-
responseProxy: (response: Response) => Promise<void>;
|
|
22
|
+
responseProxy: (response: Response<B>) => Promise<void>;
|
|
23
23
|
constructor(event: APIGatewayEvent | SQSEvent, context: Context, config?: TransactionConfig);
|
|
24
|
-
execute(executionFunc: TransactionExecution<Transaction<T, B
|
|
24
|
+
execute(executionFunc: TransactionExecution<Transaction<T, B>, B>): Promise<Response<B | ResponseErrorType> | null | SQSBatchResponse>;
|
|
25
25
|
private iexecute;
|
|
26
26
|
private executeDBTransactions;
|
|
27
27
|
private executeLoggerFlush;
|
|
@@ -126,7 +126,7 @@ var Transaction = /** @class */ (function () {
|
|
|
126
126
|
return [4 /*yield*/, this.response.build(this.context, this, this.syncReturn)];
|
|
127
127
|
case 3:
|
|
128
128
|
_b.sent();
|
|
129
|
-
executionFailed = !!(this.response.getBody() && this.response.getBody()
|
|
129
|
+
executionFailed = !!(this.response.getBody() && this.response.getBody()["rollback"]);
|
|
130
130
|
return [3 /*break*/, 7];
|
|
131
131
|
case 4:
|
|
132
132
|
if (!(this.syncReturn && this.response)) return [3 /*break*/, 5];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transaction.js","sourceRoot":"","sources":["../../../src/BaseEvent/Transaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,0CAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"Transaction.js","sourceRoot":"","sources":["../../../src/BaseEvent/Transaction.ts"],"names":[],"mappings":"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"}
|
package/dist/src/Globals.js
CHANGED
|
@@ -21,7 +21,7 @@ var Globals = /** @class */ (function () {
|
|
|
21
21
|
Globals.Listener_HTTP_DefaultHost = "localhost";
|
|
22
22
|
Globals.Listener_HTTP_ProxyRoute = "*";
|
|
23
23
|
Globals.Listener_HTTP_DefaultTimeout = Utils_1.default.parseIntNullIfNaN(process.env.TIMEOUT) || 30000;
|
|
24
|
-
Globals.Listener_HTTP_DefaultHealthCheckRoute = "/health";
|
|
24
|
+
Globals.Listener_HTTP_DefaultHealthCheckRoute = process.env.HEALTH_ROUTE || "/health";
|
|
25
25
|
//Resps
|
|
26
26
|
Globals.Resp_MSG_EXCEPTION = "[Proxy]: Exception during request execution!";
|
|
27
27
|
Globals.Resp_CODE_EXCEPTION = "EXEC_EXCEPTION";
|
package/dist/src/Globals.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Globals.js","sourceRoot":"","sources":["../../src/Globals.ts"],"names":[],"mappings":";;AAAA,+BAAgC;AAEhC,qCAA+B;AAE/B,0CAA0C;AAC1C,MAAM,CAAC,MAAM,EAAE,CAAA;AACf;IAAA;
|
|
1
|
+
{"version":3,"file":"Globals.js","sourceRoot":"","sources":["../../src/Globals.ts"],"names":[],"mappings":";;AAAA,+BAAgC;AAEhC,qCAA+B;AAE/B,0CAA0C;AAC1C,MAAM,CAAC,MAAM,EAAE,CAAA;AACf;IAAA;IAgCA,CAAC;IA/BC,gBAAgB;IACF,mCAA2B,GAAG,2BAA2B,CAAA,CAAC,KAAK;IAC/D,0CAAkC,GAC9C,4CAA4C,CAAA,CAAC,KAAK;IACtC,mCAA2B,GACvC,0CAA0C,CAAA,CAAC,KAAK;IACpC,8BAAsB,GAAG,4BAA4B,CAAA,CAAC,KAAK;IACzE,aAAa;IACC,8BAAsB,GAAG,eAAe,CAAA;IACxC,8BAAsB,GAAG,eAAe,CAAA;IACxC,0BAAkB,GAAG,WAAW,CAAA;IAChC,2BAAmB,GAAG,aAAa,CAAA;IAEnC,iCAAyB,GACrC,eAAK,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;IAEnC,iCAAyB,GAAG,WAAW,CAAA;IACvC,gCAAwB,GAAG,GAAG,CAAA;IAC9B,oCAA4B,GACxC,eAAK,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,CAAA;IACzC,6CAAqC,GACjD,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,SAAS,CAAA;IACvC,OAAO;IACO,0BAAkB,GAC9B,8CAA8C,CAAA;IAClC,2BAAmB,GAAG,gBAAgB,CAAA;IACtC,iCAAyB,GAAG,GAAG,CAAA;IAE/B,4BAAoB,GAAG,wCAAwC,CAAA;IAC/D,6BAAqB,GAAG,gBAAgB,CAAA;IACxC,mCAA2B,GAAG,GAAG,CAAA;IACjD,cAAC;CAAA,AAhCD,IAgCC;kBAhCoB,OAAO"}
|
|
@@ -85,7 +85,7 @@ var Logger = /** @class */ (function () {
|
|
|
85
85
|
//
|
|
86
86
|
this.origin = PURE_CONSOLE;
|
|
87
87
|
this._LOG_LEVEL = (_config === null || _config === void 0 ? void 0 : _config.logLevel)
|
|
88
|
-
? LOG_LEVELS[_config === null || _config === void 0 ? void 0 : _config.logLevel]
|
|
88
|
+
? LOG_LEVELS[_config === null || _config === void 0 ? void 0 : _config.logLevel] || LOG_LEVELS.DEBUG
|
|
89
89
|
: LOG_LEVELS.DEBUG;
|
|
90
90
|
this._config = _config || {};
|
|
91
91
|
this._transactionID = transactionID;
|
|
@@ -106,49 +106,49 @@ var Logger = /** @class */ (function () {
|
|
|
106
106
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
107
107
|
args[_i] = arguments[_i];
|
|
108
108
|
}
|
|
109
|
-
this._processLog(
|
|
109
|
+
this._processLog(LOG_LEVELS.DEBUG, args);
|
|
110
110
|
};
|
|
111
111
|
Logger.prototype.log = function () {
|
|
112
112
|
var args = [];
|
|
113
113
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
114
114
|
args[_i] = arguments[_i];
|
|
115
115
|
}
|
|
116
|
-
this._processLog(
|
|
116
|
+
this._processLog(LOG_LEVELS.INFO, args);
|
|
117
117
|
};
|
|
118
118
|
Logger.prototype.info = function () {
|
|
119
119
|
var args = [];
|
|
120
120
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
121
121
|
args[_i] = arguments[_i];
|
|
122
122
|
}
|
|
123
|
-
this._processLog(
|
|
123
|
+
this._processLog(LOG_LEVELS.INFO, args);
|
|
124
124
|
};
|
|
125
125
|
Logger.prototype.warning = function () {
|
|
126
126
|
var args = [];
|
|
127
127
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
128
128
|
args[_i] = arguments[_i];
|
|
129
129
|
}
|
|
130
|
-
this._processLog(
|
|
130
|
+
this._processLog(LOG_LEVELS.WARN, args);
|
|
131
131
|
};
|
|
132
132
|
Logger.prototype.warn = function () {
|
|
133
133
|
var args = [];
|
|
134
134
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
135
135
|
args[_i] = arguments[_i];
|
|
136
136
|
}
|
|
137
|
-
this._processLog(
|
|
137
|
+
this._processLog(LOG_LEVELS.WARN, args);
|
|
138
138
|
};
|
|
139
139
|
Logger.prototype.error = function () {
|
|
140
140
|
var args = [];
|
|
141
141
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
142
142
|
args[_i] = arguments[_i];
|
|
143
143
|
}
|
|
144
|
-
this._processLog(
|
|
144
|
+
this._processLog(LOG_LEVELS.ERROR, args);
|
|
145
145
|
};
|
|
146
146
|
Logger.prototype.exception = function (exception) {
|
|
147
147
|
var args = [];
|
|
148
148
|
for (var _i = 1; _i < arguments.length; _i++) {
|
|
149
149
|
args[_i - 1] = arguments[_i];
|
|
150
150
|
}
|
|
151
|
-
this._exception(
|
|
151
|
+
this._exception(exception, args);
|
|
152
152
|
};
|
|
153
153
|
//
|
|
154
154
|
Logger.prototype.cleanUp = function () { };
|
|
@@ -166,35 +166,35 @@ var Logger = /** @class */ (function () {
|
|
|
166
166
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
167
167
|
args[_i] = arguments[_i];
|
|
168
168
|
}
|
|
169
|
-
return _this._processLog(
|
|
169
|
+
return _this._processLog(LOG_LEVELS.DEBUG, args);
|
|
170
170
|
},
|
|
171
171
|
log: function () {
|
|
172
172
|
var args = [];
|
|
173
173
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
174
174
|
args[_i] = arguments[_i];
|
|
175
175
|
}
|
|
176
|
-
return _this._processLog(
|
|
176
|
+
return _this._processLog(LOG_LEVELS.INFO, args);
|
|
177
177
|
},
|
|
178
178
|
info: function () {
|
|
179
179
|
var args = [];
|
|
180
180
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
181
181
|
args[_i] = arguments[_i];
|
|
182
182
|
}
|
|
183
|
-
return _this._processLog(
|
|
183
|
+
return _this._processLog(LOG_LEVELS.INFO, args);
|
|
184
184
|
},
|
|
185
185
|
warn: function () {
|
|
186
186
|
var args = [];
|
|
187
187
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
188
188
|
args[_i] = arguments[_i];
|
|
189
189
|
}
|
|
190
|
-
return _this._processLog(
|
|
190
|
+
return _this._processLog(LOG_LEVELS.WARN, args);
|
|
191
191
|
},
|
|
192
192
|
error: function () {
|
|
193
193
|
var args = [];
|
|
194
194
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
195
195
|
args[_i] = arguments[_i];
|
|
196
196
|
}
|
|
197
|
-
return _this._processLog(
|
|
197
|
+
return _this._processLog(LOG_LEVELS.ERROR, args);
|
|
198
198
|
},
|
|
199
199
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
200
200
|
// @ts-ignore
|
|
@@ -203,35 +203,21 @@ var Logger = /** @class */ (function () {
|
|
|
203
203
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
204
204
|
args[_i] = arguments[_i];
|
|
205
205
|
}
|
|
206
|
-
return _this._processLog(
|
|
206
|
+
return _this._processLog(false, LOG_LEVELS.WARN, args);
|
|
207
207
|
},
|
|
208
208
|
exception: function (exception) {
|
|
209
209
|
var args = [];
|
|
210
210
|
for (var _i = 1; _i < arguments.length; _i++) {
|
|
211
211
|
args[_i - 1] = arguments[_i];
|
|
212
212
|
}
|
|
213
|
-
return _this._exception(
|
|
213
|
+
return _this._exception(exception, args);
|
|
214
214
|
},
|
|
215
215
|
};
|
|
216
216
|
};
|
|
217
217
|
/* Formatters */
|
|
218
|
-
Logger.prototype.
|
|
219
|
-
var d = new Date();
|
|
220
|
-
return ([
|
|
221
|
-
Utils_1.default.toDoubleDigit(d.getMonth() + 1),
|
|
222
|
-
Utils_1.default.toDoubleDigit(d.getDate()),
|
|
223
|
-
d.getFullYear(),
|
|
224
|
-
].join("/") +
|
|
225
|
-
" " +
|
|
226
|
-
[
|
|
227
|
-
Utils_1.default.toDoubleDigit(d.getHours()),
|
|
228
|
-
Utils_1.default.toDoubleDigit(d.getMinutes()),
|
|
229
|
-
Utils_1.default.toDoubleDigit(d.getSeconds()),
|
|
230
|
-
].join(":"));
|
|
231
|
-
};
|
|
232
|
-
Logger.prototype._formattedLog = function (level, msg, caller, isRaw) {
|
|
218
|
+
Logger.prototype._formattedLog = function (level, msg, caller) {
|
|
233
219
|
if (Utils_1.default.isHybridlessContainer() && this._transactionID) {
|
|
234
|
-
return (
|
|
220
|
+
return (" ".concat(this._transactionID) +
|
|
235
221
|
" [".concat(level.toString(), "] [").concat(caller, "] ").concat(msg
|
|
236
222
|
.map(this._suppressSensitiveInfo)
|
|
237
223
|
.join(" ")));
|
|
@@ -256,7 +242,7 @@ var Logger = /** @class */ (function () {
|
|
|
256
242
|
return "";
|
|
257
243
|
};
|
|
258
244
|
/* Helpers (core functionality) */
|
|
259
|
-
Logger.prototype._processLog = function (
|
|
245
|
+
Logger.prototype._processLog = function (level, args) {
|
|
260
246
|
var e_1, _a;
|
|
261
247
|
if (level < this._LOG_LEVEL)
|
|
262
248
|
return;
|
|
@@ -280,13 +266,13 @@ var Logger = /** @class */ (function () {
|
|
|
280
266
|
}
|
|
281
267
|
//push into logs stack
|
|
282
268
|
// todo: improve error stack
|
|
283
|
-
this._pushLog(level, this._formattedLog(level, msg, this._callerName(3)
|
|
269
|
+
this._pushLog(level, this._formattedLog(level, msg, this._callerName(3)));
|
|
284
270
|
};
|
|
285
|
-
Logger.prototype._exception = function (
|
|
271
|
+
Logger.prototype._exception = function (exception) {
|
|
286
272
|
var e_2, _a;
|
|
287
273
|
var args = [];
|
|
288
|
-
for (var _i =
|
|
289
|
-
args[_i -
|
|
274
|
+
for (var _i = 1; _i < arguments.length; _i++) {
|
|
275
|
+
args[_i - 1] = arguments[_i];
|
|
290
276
|
}
|
|
291
277
|
//format message
|
|
292
278
|
var msg = [];
|
|
@@ -310,7 +296,7 @@ var Logger = /** @class */ (function () {
|
|
|
310
296
|
if (exception.stack)
|
|
311
297
|
msg.push(exception.stack); //push Exeception stack at the end
|
|
312
298
|
//push into logs stack
|
|
313
|
-
this._pushLog(LOG_LEVELS.ERROR, this._formattedLog(LOG_LEVELS.ERROR, msg, this._callerName(3)
|
|
299
|
+
this._pushLog(LOG_LEVELS.ERROR, this._formattedLog(LOG_LEVELS.ERROR, msg, this._callerName(3)));
|
|
314
300
|
};
|
|
315
301
|
Logger.prototype._pushLog = function (level, fMsg) {
|
|
316
302
|
// push into logs stack
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../src/Logger/Logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA8B;AAC9B,+CAAgD;AAChD,wCAAyC;AAEzC,EAAE;AACF,sCAAgC;AAChC,EAAE;AACF,IAAY,UAKX;AALD,WAAY,UAAU;IACpB,6BAAe,CAAA;IACf,2BAAa,CAAA;IACb,2BAAa,CAAA;IACb,6BAAe,CAAA;AACjB,CAAC,EALW,UAAU,0BAAV,UAAU,QAKrB;AACD,IAAM,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;AACvE,IAAM,oBAAoB,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;AAChE,EAAE;AACF,IAAM,SAAS,GAAG;IAChB,UAAU;IACV,aAAa,CAAC,WAAW;IACzB,WAAW;IACX,gBAAgB;IAChB,OAAO;IACP,KAAK;IACL,eAAe;IACf,aAAa;IACb,YAAY;IACZ,aAAa;IACb,UAAU;IACV,oBAAoB;CACrB,CAAA;AAMD,EAAE;AACF;IAOE,gBAAY,OAAiC,EAAE,aAAqB;QAClE,KAAK,CAAC,IAAI,CAAC,CAAA;QACX,EAAE;QACF,IAAI,CAAC,MAAM,GAAG,YAAY,CAAA;QAC1B,IAAI,CAAC,UAAU,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ;YACjC,CAAC,CAAC,UAAU,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../src/Logger/Logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
2
|
import { ResponseErrorType } from "../API/Response";
|
|
3
3
|
import Transaction, { TransactionConfig, TransactionExecution } from "../BaseEvent/Transaction";
|
|
4
|
-
export interface Route<InputType =
|
|
4
|
+
export interface Route<InputType = any, OutputType = any> {
|
|
5
5
|
path: string;
|
|
6
6
|
method: string;
|
|
7
|
-
handler: TransactionExecution<Transaction<InputType>, OutputType | ResponseErrorType>;
|
|
7
|
+
handler: TransactionExecution<Transaction<InputType, OutputType>, OutputType | ResponseErrorType>;
|
|
8
8
|
inputSchema?: z.ZodObject<any>;
|
|
9
9
|
}
|
|
10
10
|
export type RouterConfig = TransactionConfig & {
|
|
@@ -56,60 +56,62 @@ var Server = /** @class */ (function () {
|
|
|
56
56
|
this.config = config;
|
|
57
57
|
}
|
|
58
58
|
Server.prototype.getExport = function () {
|
|
59
|
-
return this.handleServerlessEvent;
|
|
59
|
+
return this.handleServerlessEvent.bind(this);
|
|
60
60
|
};
|
|
61
61
|
Server.prototype.handleServerlessEvent = function (event, context) {
|
|
62
62
|
return __awaiter(this, void 0, void 0, function () {
|
|
63
|
+
var config;
|
|
63
64
|
var _this = this;
|
|
64
65
|
return __generator(this, function (_a) {
|
|
65
66
|
switch (_a.label) {
|
|
66
|
-
case 0:
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
67
|
+
case 0:
|
|
68
|
+
config = this.config;
|
|
69
|
+
// init transaction
|
|
70
|
+
return [4 /*yield*/, new Transaction_1.default(event, context, config).execute(function (transaction) { return __awaiter(_this, void 0, void 0, function () {
|
|
71
|
+
var _a, _b, route, handler, validationResp, e_1_1;
|
|
72
|
+
var e_1, _c;
|
|
73
|
+
return __generator(this, function (_d) {
|
|
74
|
+
switch (_d.label) {
|
|
75
|
+
case 0:
|
|
76
|
+
_d.trys.push([0, 5, 6, 7]);
|
|
77
|
+
_a = __values(config.routes), _b = _a.next();
|
|
78
|
+
_d.label = 1;
|
|
79
|
+
case 1:
|
|
80
|
+
if (!!_b.done) return [3 /*break*/, 4];
|
|
81
|
+
route = _b.value;
|
|
82
|
+
handler = Server.routeMatches(route.path, route.method, transaction);
|
|
83
|
+
if (!handler) return [3 /*break*/, 3];
|
|
84
|
+
transaction.logger.log("Router accepted route:", route.path);
|
|
85
|
+
// Validate input
|
|
86
|
+
if (route.inputSchema) {
|
|
87
|
+
validationResp = Validator_1.default.validateSchema(transaction.request.getBody(), route.inputSchema);
|
|
88
|
+
if (validationResp && validationResp instanceof Response_1.default)
|
|
89
|
+
return [2 /*return*/, validationResp];
|
|
90
|
+
}
|
|
91
|
+
return [4 /*yield*/, route.handler(transaction)];
|
|
92
|
+
case 2:
|
|
93
|
+
// Continue to route handler
|
|
94
|
+
return [2 /*return*/, _d.sent()];
|
|
95
|
+
case 3:
|
|
96
|
+
_b = _a.next();
|
|
97
|
+
return [3 /*break*/, 1];
|
|
98
|
+
case 4: return [3 /*break*/, 7];
|
|
99
|
+
case 5:
|
|
100
|
+
e_1_1 = _d.sent();
|
|
101
|
+
e_1 = { error: e_1_1 };
|
|
102
|
+
return [3 /*break*/, 7];
|
|
103
|
+
case 6:
|
|
104
|
+
try {
|
|
105
|
+
if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
|
|
106
|
+
}
|
|
107
|
+
finally { if (e_1) throw e_1.error; }
|
|
108
|
+
return [7 /*endfinally*/];
|
|
109
|
+
case 7:
|
|
110
|
+
//No route found :/
|
|
111
|
+
return [2 /*return*/, new Response_1.default(404, { err: "Route not found!" })];
|
|
112
|
+
}
|
|
113
|
+
});
|
|
114
|
+
}); })];
|
|
113
115
|
case 1:
|
|
114
116
|
// init transaction
|
|
115
117
|
_a.sent();
|
|
@@ -119,13 +121,15 @@ var Server = /** @class */ (function () {
|
|
|
119
121
|
});
|
|
120
122
|
};
|
|
121
123
|
// Helper function to match route
|
|
122
|
-
Server.
|
|
123
|
-
var path =
|
|
124
|
+
Server.routeMatches = function (routePath, routeMethod, transaction) {
|
|
125
|
+
var path = transaction.request.getPath();
|
|
124
126
|
var keys = [];
|
|
125
127
|
var result = pathToRegexp(routePath, keys).exec(path);
|
|
126
128
|
if (result) {
|
|
127
|
-
var reqMethod =
|
|
129
|
+
var reqMethod = transaction.request.getMethod();
|
|
128
130
|
if (reqMethod.toLowerCase() == routeMethod.toLowerCase()) {
|
|
131
|
+
//Fix path params on proxy
|
|
132
|
+
transaction.request.setFixedPathParams(keys, result);
|
|
129
133
|
return true;
|
|
130
134
|
}
|
|
131
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../../../../src/Server/lib/Server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAA8C;AAE9C,+CAAyC;AACzC,2DAAqD;AACrD,wDAAkD;AAGlD;IAEE,gBAAY,MAAoB;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAEM,0BAAS,GAAhB;QACE,OAAO,IAAI,CAAC,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../../../../src/Server/lib/Server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAA8C;AAE9C,+CAAyC;AACzC,2DAAqD;AACrD,wDAAkD;AAGlD;IAEE,gBAAY,MAAoB;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAEM,0BAAS,GAAhB;QACE,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAEY,sCAAqB,GAAlC,UACE,KAA2B,EAC3B,OAAgB;;;;;;;wBAEV,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;wBAC1B,mBAAmB;wBACnB,qBAAM,IAAI,qBAAW,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,OAAO,CACnD,UAAO,WAAW;;;;;;;4CACI,KAAA,SAAA,MAAM,CAAC,MAAM,CAAA;;;;4CAAtB,KAAK;4CAER,OAAO,GAAG,MAAM,CAAC,YAAY,CACjC,KAAK,CAAC,IAAI,EACV,KAAK,CAAC,MAAM,EACZ,WAAW,CACZ,CAAA;iDACG,OAAO,EAAP,wBAAO;4CACT,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;4CAC5D,iBAAiB;4CACjB,IAAI,KAAK,CAAC,WAAW,EAAE;gDACf,cAAc,GAAG,mBAAS,CAAC,cAAc,CAC7C,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,EAC7B,KAAK,CAAC,WAAW,CAClB,CAAA;gDACD,IAAI,cAAc,IAAI,cAAc,YAAY,kBAAQ;oDACtD,sBAAO,cAAc,EAAA;6CACxB;4CAEM,qBAAM,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAA;;wCADvC,4BAA4B;wCAC5B,sBAAO,SAAgC,EAAA;;;;;;;;;;;;;;;;wCAG3C,mBAAmB;wCACnB,sBAAO,IAAI,kBAAQ,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC,EAAA;;;iCACtD,CACF,EAAA;;wBA5BD,mBAAmB;wBACnB,SA2BC,CAAA;;;;;KACF;IACD,iCAAiC;IAClB,mBAAY,GAA3B,UACE,SAAiB,EACjB,WAAmB,EACnB,WAAwB;QAExB,IAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;QAC1C,IAAM,IAAI,GAAG,EAAE,CAAA;QACf,IAAM,MAAM,GAAG,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACvD,IAAI,MAAM,EAAE;YACV,IAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,CAAA;YACjD,IAAI,SAAS,CAAC,WAAW,EAAE,IAAI,WAAW,CAAC,WAAW,EAAE,EAAE;gBACxD,0BAA0B;gBAC1B,WAAW,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBACpD,OAAO,IAAI,CAAA;aACZ;SACF;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IACH,aAAC;AAAD,CAAC,AAhED,IAgEC"}
|
|
@@ -84,6 +84,7 @@ exports.default = (function (serverlessHandler) {
|
|
|
84
84
|
case 3:
|
|
85
85
|
e_1 = _a.sent();
|
|
86
86
|
console.error("[Proxy] - Exception during execution!", e_1);
|
|
87
|
+
console.error(e_1.stack);
|
|
87
88
|
resp = res.status(Globals_1.default.Resp_STATUSCODE_EXCEPTION).json(__assign(__assign({}, e_1), { err: Globals_1.default.Resp_MSG_EXCEPTION, errCode: Globals_1.default.Resp_CODE_EXCEPTION }));
|
|
88
89
|
return [3 /*break*/, 4];
|
|
89
90
|
case 4:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GenericHandler.js","sourceRoot":"","sources":["../../../../../src/Server/lib/container/GenericHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,6DAE8B;AAC9B,4CAAsC;AACtC,4CAAsC;AAGtC,mBAAe,UAAC,iBAAkD;IAChE,OAAO,UAAO,OAAgB,EAAE,GAAa;;;;;oBACrC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;oBACxB,IAAI,GAAG,IAAI,CAAA;;;;oBAGP,UAAQ,IAAI,6BAAmB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;oBAE1C,qBAAM,OAAK,CAAC,MAAM,EAAE;wBAC3C,UAAU;sBADiC;;oBAArC,cAAc,GAAG,SAAoB;oBAC3C,UAAU;oBACV,IAAI,GAAG,yBAAyB,CAAC,cAAc,EAAE,GAAG,CAAC,CAAA;;;;oBAErD,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,GAAC,CAAC,CAAA;oBACzD,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,iBAAO,CAAC,yBAAyB,CAAC,CAAC,IAAI,uBACpD,GAAC,KACJ,GAAG,EAAE,iBAAO,CAAC,kBAAkB,EAC/B,OAAO,EAAE,iBAAO,CAAC,mBAAmB,IACpC,CAAA;;;oBAEJ,OAAO,CAAC,KAAK,CAAC,iCAA0B,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,OAAI,CAAC,CAAA;oBACnE,sBAAO,IAAI,EAAA;;;SACZ,CAAA;AACH,CAAC,EAAA;AACD,IAAM,yBAAyB,GAAG,UAChC,UAAuC,EACvC,GAAa;;;IAEb,iCAAiC;IACjC,IAAI,UAAU,IAAI,UAAU,CAAC,GAAG,EAAE;QAChC,WAAW;QACX,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;KACrD;SAAM,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE;QAC1C,wBAAwB;QACxB,OAAO,GAAG,CAAC,MAAM,CAAC,iBAAO,CAAC,2BAA2B,CAAC,CAAC,IAAI,CAAC;YAC1D,GAAG,EAAE,iBAAO,CAAC,oBAAoB;YACjC,OAAO,EAAE,iBAAO,CAAC,qBAAqB;SACvC,CAAC,CAAA;KACH;SAAM;QACL,oBAAoB;QACpB,IAAI,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,0CAAE,OAAO,EAAE;;gBAC7B,KAAmB,IAAA,KAAA,SAAA,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA,gBAAA,4BAAE;oBAApD,IAAM,IAAI,WAAA;oBACb,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;iBAChD;;;;;;;;;SACF;QACD,QAAQ;QACR,IAAM,QAAQ,GAAG,GAAG;aACjB,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;aAClC,IAAI,CAAC,eAAK,CAAC,sBAAsB,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QACjE,OAAO,QAAQ,CAAA;KAChB;AACH,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"GenericHandler.js","sourceRoot":"","sources":["../../../../../src/Server/lib/container/GenericHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,6DAE8B;AAC9B,4CAAsC;AACtC,4CAAsC;AAGtC,mBAAe,UAAC,iBAAkD;IAChE,OAAO,UAAO,OAAgB,EAAE,GAAa;;;;;oBACrC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;oBACxB,IAAI,GAAG,IAAI,CAAA;;;;oBAGP,UAAQ,IAAI,6BAAmB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;oBAE1C,qBAAM,OAAK,CAAC,MAAM,EAAE;wBAC3C,UAAU;sBADiC;;oBAArC,cAAc,GAAG,SAAoB;oBAC3C,UAAU;oBACV,IAAI,GAAG,yBAAyB,CAAC,cAAc,EAAE,GAAG,CAAC,CAAA;;;;oBAErD,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,GAAC,CAAC,CAAA;oBACzD,OAAO,CAAC,KAAK,CAAC,GAAC,CAAC,KAAK,CAAC,CAAA;oBACtB,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,iBAAO,CAAC,yBAAyB,CAAC,CAAC,IAAI,uBACpD,GAAC,KACJ,GAAG,EAAE,iBAAO,CAAC,kBAAkB,EAC/B,OAAO,EAAE,iBAAO,CAAC,mBAAmB,IACpC,CAAA;;;oBAEJ,OAAO,CAAC,KAAK,CAAC,iCAA0B,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,OAAI,CAAC,CAAA;oBACnE,sBAAO,IAAI,EAAA;;;SACZ,CAAA;AACH,CAAC,EAAA;AACD,IAAM,yBAAyB,GAAG,UAChC,UAAuC,EACvC,GAAa;;;IAEb,iCAAiC;IACjC,IAAI,UAAU,IAAI,UAAU,CAAC,GAAG,EAAE;QAChC,WAAW;QACX,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;KACrD;SAAM,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE;QAC1C,wBAAwB;QACxB,OAAO,GAAG,CAAC,MAAM,CAAC,iBAAO,CAAC,2BAA2B,CAAC,CAAC,IAAI,CAAC;YAC1D,GAAG,EAAE,iBAAO,CAAC,oBAAoB;YACjC,OAAO,EAAE,iBAAO,CAAC,qBAAqB;SACvC,CAAC,CAAA;KACH;SAAM;QACL,oBAAoB;QACpB,IAAI,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,0CAAE,OAAO,EAAE;;gBAC7B,KAAmB,IAAA,KAAA,SAAA,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA,gBAAA,4BAAE;oBAApD,IAAM,IAAI,WAAA;oBACb,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;iBAChD;;;;;;;;;SACF;QACD,QAAQ;QACR,IAAM,QAAQ,GAAG,GAAG;aACjB,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;aAClC,IAAI,CAAC,eAAK,CAAC,sBAAsB,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QACjE,OAAO,QAAQ,CAAA;KAChB;AACH,CAAC,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
|
-
import Response from "../API/Response";
|
|
2
|
+
import Response, { ResponseErrorType } from "../API/Response";
|
|
3
3
|
export default class Validator {
|
|
4
|
-
static validateSchema(data: any, schema: z.ZodObject<any>): boolean | Response
|
|
4
|
+
static validateSchema(data: any, schema: z.ZodObject<any>): boolean | Response<ResponseErrorType>;
|
|
5
5
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../src/Validation/Validator.ts"],"names":[],"mappings":";;AAEA,
|
|
1
|
+
{"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../../src/Validation/Validator.ts"],"names":[],"mappings":";;AAEA,4CAA6D;AAC7D,sCAAgC;AAEhC;IAAA;IAwBA,CAAC;IAvBe,wBAAc,GAA5B,UACE,IAAS,EACT,MAAwB;QAExB,IAAI,KAAK,EAAE,cAAc,CAAA;QACzB,yCAAyC;QACzC,IAAI;YACF,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAkB,CAAA;SACrD;QAAC,OAAO,GAAqB,EAAE;YAC9B,IAAI,GAAG,CAAC,OAAO;gBAAE,KAAK,GAAG,GAAG,CAAC,OAAO,CAAA;;gBAC/B,KAAK,GAAG,2BAA2B,CAAA;SACzC;QACD,mBAAmB;QACnB,IAAI,CAAC,cAAc,IAAI,KAAK,EAAE;YAC5B,OAAO,kBAAQ,CAAC,kBAAkB,CAChC,iBAAO,CAAC,2BAA2B,EACnC,iBAAO,CAAC,sBAAsB,EAC9B,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAC7B,CAAA;SACF;aAAM;YACL,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;IACH,gBAAC;AAAD,CAAC,AAxBD,IAwBC"}
|
package/package.json
CHANGED
package/src/API/Request.ts
CHANGED
|
@@ -85,4 +85,13 @@ export default class Request<T> {
|
|
|
85
85
|
const hOrigin = this.getHeader("X-Forwarded-For")
|
|
86
86
|
return origin ? origin : hOrigin ? hOrigin : "unknow"
|
|
87
87
|
}
|
|
88
|
+
|
|
89
|
+
//ugly fix
|
|
90
|
+
public setFixedPathParams(keys: any[], result: any[]): void {
|
|
91
|
+
this.requestEvent.pathParameters = {}
|
|
92
|
+
keys.forEach(
|
|
93
|
+
(key, index) =>
|
|
94
|
+
(this.requestEvent.pathParameters[key.name] = result[index + 1]),
|
|
95
|
+
)
|
|
96
|
+
}
|
|
88
97
|
}
|
package/src/API/Response.ts
CHANGED
|
@@ -16,7 +16,7 @@ export type ResponseErrorType = {
|
|
|
16
16
|
errCode?: string
|
|
17
17
|
}
|
|
18
18
|
//
|
|
19
|
-
export default class Response<B =
|
|
19
|
+
export default class Response<B = null> {
|
|
20
20
|
private _statusCode: number
|
|
21
21
|
private _body: any
|
|
22
22
|
private _isPipingOut: boolean
|
|
@@ -68,7 +68,7 @@ export default class Response<B = any | ResponseErrorType> {
|
|
|
68
68
|
}
|
|
69
69
|
public async build(
|
|
70
70
|
context: Context,
|
|
71
|
-
transaction: Transaction<any>,
|
|
71
|
+
transaction: Transaction<any, B>,
|
|
72
72
|
_optDoNotCallContext: boolean,
|
|
73
73
|
): Promise<void> {
|
|
74
74
|
//Stream support
|
|
@@ -111,7 +111,10 @@ export default class Response<B = any | ResponseErrorType> {
|
|
|
111
111
|
//log response and respond to context
|
|
112
112
|
context.succeed(b)
|
|
113
113
|
}
|
|
114
|
-
private _rawContext(
|
|
114
|
+
private _rawContext(
|
|
115
|
+
context: Context,
|
|
116
|
+
transaction: Transaction<null, B>,
|
|
117
|
+
): void {
|
|
115
118
|
//log response and respond to context
|
|
116
119
|
transaction.logger.debug(this._body)
|
|
117
120
|
if (this.getCode() <= 200 && this.getCode() <= 299)
|
|
@@ -141,13 +144,13 @@ export default class Response<B = any | ResponseErrorType> {
|
|
|
141
144
|
errCode: Globals.ErrorCode_MissingParam,
|
|
142
145
|
})
|
|
143
146
|
}
|
|
144
|
-
public static BadRequestResponse
|
|
147
|
+
public static BadRequestResponse(
|
|
145
148
|
msg?: string,
|
|
146
149
|
errCode?: string,
|
|
147
150
|
optBody?: any,
|
|
148
|
-
): Response<
|
|
151
|
+
): Response<ResponseErrorType> {
|
|
149
152
|
console.warn(`Bad request - ${msg}`)
|
|
150
|
-
return new Response(400, {
|
|
153
|
+
return new Response<ResponseErrorType>(400, {
|
|
151
154
|
err: msg,
|
|
152
155
|
...(errCode ? { errCode: errCode } : {}),
|
|
153
156
|
...(optBody || {}),
|
package/src/API/Utils.ts
CHANGED
|
@@ -2,9 +2,6 @@ export default class Utils {
|
|
|
2
2
|
public static isHybridlessContainer(): boolean {
|
|
3
3
|
return !!process.env.HYBRIDLESS_RUNTIME
|
|
4
4
|
}
|
|
5
|
-
public static toDoubleDigit(str: string | number): string {
|
|
6
|
-
return String("0" + str).slice(-2)
|
|
7
|
-
}
|
|
8
5
|
public static isValidString(string: string): boolean {
|
|
9
6
|
return string?.length > 0 && !Array.isArray(string)
|
|
10
7
|
}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import type { Context, SQSBatchResponse, SQSEvent } from "aws-lambda"
|
|
2
2
|
|
|
3
3
|
import Transaction, { TransactionConfig } from "./Transaction"
|
|
4
|
-
import Response from "../API/Response"
|
|
4
|
+
import Response, { ResponseErrorType } from "../API/Response"
|
|
5
5
|
import Globals from "../Globals"
|
|
6
6
|
|
|
7
7
|
// Handler
|
|
8
8
|
export type EventProcessorExecution = (
|
|
9
|
-
transaction: Transaction,
|
|
9
|
+
transaction: Transaction<null, ResponseErrorType>,
|
|
10
10
|
recordContent: string | object,
|
|
11
11
|
) => Promise<Response | SQSBatchResponse>
|
|
12
12
|
|
|
@@ -29,7 +29,7 @@ export default class EventProcessor {
|
|
|
29
29
|
async processEvent(
|
|
30
30
|
execution: EventProcessorExecution,
|
|
31
31
|
doNotDecodeMessage?: boolean,
|
|
32
|
-
): Promise<Response | null | SQSBatchResponse> {
|
|
32
|
+
): Promise<Response<ResponseErrorType> | null | SQSBatchResponse> {
|
|
33
33
|
const resp = await this._processRawEvent(execution, !!doNotDecodeMessage)
|
|
34
34
|
if (
|
|
35
35
|
!this._allowFailure &&
|
|
@@ -44,14 +44,18 @@ export default class EventProcessor {
|
|
|
44
44
|
async _processRawEvent(
|
|
45
45
|
execution: EventProcessorExecution,
|
|
46
46
|
doNotDecodeMessage: boolean,
|
|
47
|
-
): Promise<Response | null | SQSBatchResponse> {
|
|
47
|
+
): Promise<Response<ResponseErrorType> | null | SQSBatchResponse> {
|
|
48
48
|
if (this._event.Records && this._event.Records.length > 0) {
|
|
49
49
|
//safe check for empty events?
|
|
50
50
|
//init transaction for all records
|
|
51
|
-
return await new Transaction
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
51
|
+
return await new Transaction<null, null | ResponseErrorType>(
|
|
52
|
+
this._event,
|
|
53
|
+
this._context,
|
|
54
|
+
{
|
|
55
|
+
...this._apiConfig,
|
|
56
|
+
syncReturn: true,
|
|
57
|
+
},
|
|
58
|
+
).execute(async (transaction) => {
|
|
55
59
|
//Map records with decoded message when required
|
|
56
60
|
const decodedRecords: string[] | object[] = this._event.Records.map(
|
|
57
61
|
(eventRecord) =>
|
|
@@ -6,13 +6,13 @@ import type {
|
|
|
6
6
|
} from "aws-lambda"
|
|
7
7
|
|
|
8
8
|
import Request from "../API/Request"
|
|
9
|
-
import Response from "../API/Response"
|
|
9
|
+
import Response, { ResponseErrorType } from "../API/Response"
|
|
10
10
|
import Globals from "../Globals"
|
|
11
11
|
import Logger, { LoggerConfig } from "../Logger/Logger"
|
|
12
12
|
import Publisher, { PublisherConfig } from "../Publisher/Publisher"
|
|
13
13
|
|
|
14
14
|
// Request
|
|
15
|
-
export type TransactionExecution<T, B
|
|
15
|
+
export type TransactionExecution<T, B> = (
|
|
16
16
|
transaction: T,
|
|
17
17
|
) => Promise<Response<B> | SQSBatchResponse>
|
|
18
18
|
// Config
|
|
@@ -27,14 +27,14 @@ export type TransactionConfig = {
|
|
|
27
27
|
export default class Transaction<T = object, B = null> {
|
|
28
28
|
private event: any
|
|
29
29
|
private context: Context
|
|
30
|
-
private response: Response | null | SQSBatchResponse
|
|
30
|
+
private response: Response<B | ResponseErrorType> | null | SQSBatchResponse
|
|
31
31
|
private syncReturn: boolean
|
|
32
32
|
private retrowErrors: boolean
|
|
33
33
|
//
|
|
34
34
|
public readonly logger: Logger
|
|
35
35
|
public readonly request: Request<T>
|
|
36
36
|
public readonly publisher: Publisher
|
|
37
|
-
public responseProxy: (response: Response) => Promise<void>
|
|
37
|
+
public responseProxy: (response: Response<B>) => Promise<void>
|
|
38
38
|
//
|
|
39
39
|
constructor(
|
|
40
40
|
event: APIGatewayEvent | SQSEvent,
|
|
@@ -63,8 +63,8 @@ export default class Transaction<T = object, B = null> {
|
|
|
63
63
|
|
|
64
64
|
//Main interface
|
|
65
65
|
public async execute(
|
|
66
|
-
executionFunc: TransactionExecution<Transaction<T, B
|
|
67
|
-
): Promise<Response | null | SQSBatchResponse> {
|
|
66
|
+
executionFunc: TransactionExecution<Transaction<T, B>, B>,
|
|
67
|
+
): Promise<Response<B | ResponseErrorType> | null | SQSBatchResponse> {
|
|
68
68
|
await this.executeLoggerFlush(async () => {
|
|
69
69
|
await this.executeDBTransactions(async () => {
|
|
70
70
|
return await this.iexecute(executionFunc)
|
|
@@ -77,7 +77,7 @@ export default class Transaction<T = object, B = null> {
|
|
|
77
77
|
}
|
|
78
78
|
//Executions
|
|
79
79
|
private async iexecute(
|
|
80
|
-
executionFunc: TransactionExecution<Transaction<T
|
|
80
|
+
executionFunc: TransactionExecution<Transaction<T, B>, B>,
|
|
81
81
|
): Promise<boolean> {
|
|
82
82
|
let executionFailed = true //failed til we say no!
|
|
83
83
|
//safe execution handler
|
|
@@ -89,7 +89,7 @@ export default class Transaction<T = object, B = null> {
|
|
|
89
89
|
if (this.response && this.response instanceof Response) {
|
|
90
90
|
await this.response.build(this.context, this, this.syncReturn)
|
|
91
91
|
executionFailed = !!(
|
|
92
|
-
this.response.getBody() && this.response.getBody()
|
|
92
|
+
this.response.getBody() && this.response.getBody()["rollback"]
|
|
93
93
|
)
|
|
94
94
|
} else if (this.syncReturn && this.response) {
|
|
95
95
|
this.logger.log("Sync return with different response object")
|
|
@@ -159,7 +159,10 @@ export default class Transaction<T = object, B = null> {
|
|
|
159
159
|
}
|
|
160
160
|
}
|
|
161
161
|
/* Response support */
|
|
162
|
-
private getErrorResponse(
|
|
162
|
+
private getErrorResponse(
|
|
163
|
+
error: string,
|
|
164
|
+
code: string,
|
|
165
|
+
): Response<ResponseErrorType> {
|
|
163
166
|
return Response.BadRequestResponseWithRollback(error, code)
|
|
164
167
|
}
|
|
165
168
|
}
|
package/src/Globals.ts
CHANGED
|
@@ -25,7 +25,8 @@ export default class Globals {
|
|
|
25
25
|
public static Listener_HTTP_ProxyRoute = "*"
|
|
26
26
|
public static Listener_HTTP_DefaultTimeout =
|
|
27
27
|
Utils.parseIntNullIfNaN(process.env.TIMEOUT) || 30000
|
|
28
|
-
public static Listener_HTTP_DefaultHealthCheckRoute =
|
|
28
|
+
public static Listener_HTTP_DefaultHealthCheckRoute =
|
|
29
|
+
process.env.HEALTH_ROUTE || "/health"
|
|
29
30
|
//Resps
|
|
30
31
|
public static Resp_MSG_EXCEPTION =
|
|
31
32
|
"[Proxy]: Exception during request execution!"
|
package/src/Logger/Logger.ts
CHANGED
|
@@ -46,7 +46,7 @@ export default class Logger {
|
|
|
46
46
|
//
|
|
47
47
|
this.origin = PURE_CONSOLE
|
|
48
48
|
this._LOG_LEVEL = _config?.logLevel
|
|
49
|
-
? LOG_LEVELS[_config?.logLevel]
|
|
49
|
+
? LOG_LEVELS[_config?.logLevel] || LOG_LEVELS.DEBUG
|
|
50
50
|
: LOG_LEVELS.DEBUG
|
|
51
51
|
this._config = _config || {}
|
|
52
52
|
this._transactionID = transactionID
|
|
@@ -64,25 +64,25 @@ export default class Logger {
|
|
|
64
64
|
|
|
65
65
|
//Public
|
|
66
66
|
debug(...args) {
|
|
67
|
-
this._processLog(
|
|
67
|
+
this._processLog(LOG_LEVELS.DEBUG, args)
|
|
68
68
|
}
|
|
69
69
|
log(...args) {
|
|
70
|
-
this._processLog(
|
|
70
|
+
this._processLog(LOG_LEVELS.INFO, args)
|
|
71
71
|
}
|
|
72
72
|
info(...args) {
|
|
73
|
-
this._processLog(
|
|
73
|
+
this._processLog(LOG_LEVELS.INFO, args)
|
|
74
74
|
}
|
|
75
75
|
warning(...args) {
|
|
76
|
-
this._processLog(
|
|
76
|
+
this._processLog(LOG_LEVELS.WARN, args)
|
|
77
77
|
}
|
|
78
78
|
warn(...args) {
|
|
79
|
-
this._processLog(
|
|
79
|
+
this._processLog(LOG_LEVELS.WARN, args)
|
|
80
80
|
}
|
|
81
81
|
error(...args) {
|
|
82
|
-
this._processLog(
|
|
82
|
+
this._processLog(LOG_LEVELS.ERROR, args)
|
|
83
83
|
}
|
|
84
84
|
exception(exception, ...args) {
|
|
85
|
-
this._exception(
|
|
85
|
+
this._exception(exception, args)
|
|
86
86
|
}
|
|
87
87
|
//
|
|
88
88
|
cleanUp() {}
|
|
@@ -91,44 +91,27 @@ export default class Logger {
|
|
|
91
91
|
//initialization
|
|
92
92
|
private _setupBindings(): void {
|
|
93
93
|
global.console = {
|
|
94
|
-
debug: (...args) => this._processLog(
|
|
95
|
-
log: (...args) => this._processLog(
|
|
96
|
-
info: (...args) => this._processLog(
|
|
97
|
-
warn: (...args) => this._processLog(
|
|
98
|
-
error: (...args) => this._processLog(
|
|
94
|
+
debug: (...args) => this._processLog(LOG_LEVELS.DEBUG, args),
|
|
95
|
+
log: (...args) => this._processLog(LOG_LEVELS.INFO, args),
|
|
96
|
+
info: (...args) => this._processLog(LOG_LEVELS.INFO, args),
|
|
97
|
+
warn: (...args) => this._processLog(LOG_LEVELS.WARN, args),
|
|
98
|
+
error: (...args) => this._processLog(LOG_LEVELS.ERROR, args),
|
|
99
99
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
100
100
|
// @ts-ignore
|
|
101
|
-
warning: (...args) => this._processLog(
|
|
102
|
-
exception: (exception, ...args) => this._exception(
|
|
101
|
+
warning: (...args) => this._processLog(false, LOG_LEVELS.WARN, args),
|
|
102
|
+
exception: (exception, ...args) => this._exception(exception, args),
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
|
|
106
106
|
/* Formatters */
|
|
107
|
-
private _timestamp(): string {
|
|
108
|
-
const d = new Date()
|
|
109
|
-
return (
|
|
110
|
-
[
|
|
111
|
-
Utils.toDoubleDigit(d.getMonth() + 1),
|
|
112
|
-
Utils.toDoubleDigit(d.getDate()),
|
|
113
|
-
d.getFullYear(),
|
|
114
|
-
].join("/") +
|
|
115
|
-
" " +
|
|
116
|
-
[
|
|
117
|
-
Utils.toDoubleDigit(d.getHours()),
|
|
118
|
-
Utils.toDoubleDigit(d.getMinutes()),
|
|
119
|
-
Utils.toDoubleDigit(d.getSeconds()),
|
|
120
|
-
].join(":")
|
|
121
|
-
)
|
|
122
|
-
}
|
|
123
107
|
private _formattedLog(
|
|
124
108
|
level: LOG_LEVELS,
|
|
125
109
|
msg: Array<string>,
|
|
126
110
|
caller: string,
|
|
127
|
-
isRaw: boolean,
|
|
128
111
|
): string {
|
|
129
112
|
if (Utils.isHybridlessContainer() && this._transactionID) {
|
|
130
113
|
return (
|
|
131
|
-
|
|
114
|
+
` ${this._transactionID}` +
|
|
132
115
|
` [${level.toString()}] [${caller}] ${msg
|
|
133
116
|
.map(this._suppressSensitiveInfo)
|
|
134
117
|
.join(" ")}`
|
|
@@ -152,7 +135,7 @@ export default class Logger {
|
|
|
152
135
|
return ""
|
|
153
136
|
}
|
|
154
137
|
/* Helpers (core functionality) */
|
|
155
|
-
private _processLog(
|
|
138
|
+
private _processLog(level: LOG_LEVELS, args: any): void {
|
|
156
139
|
if (level < this._LOG_LEVEL) return
|
|
157
140
|
//get args
|
|
158
141
|
const msg: Array<string> = []
|
|
@@ -165,12 +148,9 @@ export default class Logger {
|
|
|
165
148
|
}
|
|
166
149
|
//push into logs stack
|
|
167
150
|
// todo: improve error stack
|
|
168
|
-
this._pushLog(
|
|
169
|
-
level,
|
|
170
|
-
this._formattedLog(level, msg, this._callerName(3), isRaw),
|
|
171
|
-
)
|
|
151
|
+
this._pushLog(level, this._formattedLog(level, msg, this._callerName(3)))
|
|
172
152
|
}
|
|
173
|
-
private _exception(
|
|
153
|
+
private _exception(exception: Error, ...args): void {
|
|
174
154
|
//format message
|
|
175
155
|
const msg: Array<string> = []
|
|
176
156
|
//push exeception
|
|
@@ -181,7 +161,7 @@ export default class Logger {
|
|
|
181
161
|
//push into logs stack
|
|
182
162
|
this._pushLog(
|
|
183
163
|
LOG_LEVELS.ERROR,
|
|
184
|
-
this._formattedLog(LOG_LEVELS.ERROR, msg, this._callerName(3)
|
|
164
|
+
this._formattedLog(LOG_LEVELS.ERROR, msg, this._callerName(3)),
|
|
185
165
|
)
|
|
186
166
|
}
|
|
187
167
|
private _pushLog(level: LOG_LEVELS, fMsg: string): void {
|
package/src/Server/Router.ts
CHANGED
|
@@ -10,11 +10,11 @@ import Transaction, {
|
|
|
10
10
|
} from "../BaseEvent/Transaction"
|
|
11
11
|
|
|
12
12
|
// Route
|
|
13
|
-
export interface Route<InputType =
|
|
13
|
+
export interface Route<InputType = any, OutputType = any> {
|
|
14
14
|
path: string
|
|
15
15
|
method: string
|
|
16
16
|
handler: TransactionExecution<
|
|
17
|
-
Transaction<InputType>,
|
|
17
|
+
Transaction<InputType, OutputType>,
|
|
18
18
|
OutputType | ResponseErrorType
|
|
19
19
|
>
|
|
20
20
|
inputSchema?: z.ZodObject<any>
|
package/src/Server/lib/Server.ts
CHANGED
|
@@ -13,21 +13,26 @@ export default class Server {
|
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
public getExport(): CallableFunction {
|
|
16
|
-
return this.handleServerlessEvent
|
|
16
|
+
return this.handleServerlessEvent.bind(this)
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
public async handleServerlessEvent(
|
|
20
20
|
event: APIGatewayProxyEvent,
|
|
21
21
|
context: Context,
|
|
22
22
|
) {
|
|
23
|
+
const config = this.config
|
|
23
24
|
// init transaction
|
|
24
|
-
await new Transaction(event, context,
|
|
25
|
+
await new Transaction(event, context, config).execute(
|
|
25
26
|
async (transaction) => {
|
|
26
|
-
for (const route of
|
|
27
|
+
for (const route of config.routes) {
|
|
27
28
|
// Check for possible paths
|
|
28
|
-
const handler =
|
|
29
|
+
const handler = Server.routeMatches(
|
|
30
|
+
route.path,
|
|
31
|
+
route.method,
|
|
32
|
+
transaction,
|
|
33
|
+
)
|
|
29
34
|
if (handler) {
|
|
30
|
-
transaction.logger.log("Router accepted route:", route)
|
|
35
|
+
transaction.logger.log("Router accepted route:", route.path)
|
|
31
36
|
// Validate input
|
|
32
37
|
if (route.inputSchema) {
|
|
33
38
|
const validationResp = Validator.validateSchema(
|
|
@@ -47,17 +52,19 @@ export default class Server {
|
|
|
47
52
|
)
|
|
48
53
|
}
|
|
49
54
|
// Helper function to match route
|
|
50
|
-
private routeMatches(
|
|
55
|
+
private static routeMatches(
|
|
51
56
|
routePath: string,
|
|
52
57
|
routeMethod: string,
|
|
53
|
-
|
|
58
|
+
transaction: Transaction,
|
|
54
59
|
): boolean {
|
|
55
|
-
const path =
|
|
60
|
+
const path = transaction.request.getPath()
|
|
56
61
|
const keys = []
|
|
57
62
|
const result = pathToRegexp(routePath, keys).exec(path)
|
|
58
63
|
if (result) {
|
|
59
|
-
const reqMethod =
|
|
64
|
+
const reqMethod = transaction.request.getMethod()
|
|
60
65
|
if (reqMethod.toLowerCase() == routeMethod.toLowerCase()) {
|
|
66
|
+
//Fix path params on proxy
|
|
67
|
+
transaction.request.setFixedPathParams(keys, result)
|
|
61
68
|
return true
|
|
62
69
|
}
|
|
63
70
|
}
|
|
@@ -20,6 +20,7 @@ export default (serverlessHandler: Server["handleServerlessEvent"]) => {
|
|
|
20
20
|
resp = processServerlessResponse(invokationResp, res)
|
|
21
21
|
} catch (e) {
|
|
22
22
|
console.error("[Proxy] - Exception during execution!", e)
|
|
23
|
+
console.error(e.stack)
|
|
23
24
|
resp = res.status(Globals.Resp_STATUSCODE_EXCEPTION).json({
|
|
24
25
|
...e,
|
|
25
26
|
err: Globals.Resp_MSG_EXCEPTION,
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { z } from "zod"
|
|
2
2
|
|
|
3
|
-
import Response from "../API/Response"
|
|
3
|
+
import Response, { ResponseErrorType } from "../API/Response"
|
|
4
4
|
import Globals from "../Globals"
|
|
5
5
|
|
|
6
6
|
export default class Validator {
|
|
7
7
|
public static validateSchema(
|
|
8
8
|
data: any,
|
|
9
9
|
schema: z.ZodObject<any>,
|
|
10
|
-
): boolean | Response {
|
|
10
|
+
): boolean | Response<ResponseErrorType> {
|
|
11
11
|
let error, validatedInput
|
|
12
12
|
// Validate body against known zod schema
|
|
13
13
|
try {
|